diff options
| author | B Stack <bgstack15@gmail.com> | 2019-12-21 19:23:36 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-12-21 19:23:36 +0000 |
| commit | 2a1b1ad901e716163527339c804ae056c7c86e37 (patch) | |
| tree | e145606994210080b7107554af86b8bd3bb2755d | |
| parent | Merge branch 'irfanview-bump' into 'master' (diff) | |
| parent | WIP: waterfox rpm updates from phantomx (diff) | |
| download | stackrpms-2a1b1ad901e716163527339c804ae056c7c86e37.tar.gz stackrpms-2a1b1ad901e716163527339c804ae056c7c86e37.tar.bz2 stackrpms-2a1b1ad901e716163527339c804ae056c7c86e37.zip | |
Merge branch 'updates' into 'master'
Waterfox and ublock-origin
See merge request bgstack15/stackrpms!108
107 files changed, 171 insertions, 690 deletions
diff --git a/palemoon-stackrpms-ublock-origin/README.md b/palemoon-stackrpms-ublock-origin/README.md index 92ca8ba..1dd6af9 100644 --- a/palemoon-stackrpms-ublock-origin/README.md +++ b/palemoon-stackrpms-ublock-origin/README.md @@ -10,7 +10,7 @@ This package is now maintained independently in a few flavors, mostly for the in # Reverse dependency matrix Distro | uBlock Origin version ---------- | --------------- -All | 1.16.4.11 +All | 1.16.4.12 # Differences from upstream None diff --git a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec b/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec index 24431a4..f87206d 100644 --- a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec +++ b/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec @@ -4,7 +4,7 @@ #%%global app_id Name: %{app_name}-ublock-origin -Version: 1.16.4.11 +Version: 1.16.4.12 Release: 1 Summary: uBlock Origin installed to the system Pale Moon extensions directory @@ -51,6 +51,9 @@ rm -rf %{buildroot} %{moz_extensions}/*.xpi %changelog +* Wed Dec 18 2019 B Stack <bgstack15@gmail.com> - 1.16.4.12-1 +- Update + * Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 1.16.4.11-1 - Update diff --git a/palemoon-ublock-origin/debian/changelog b/palemoon-ublock-origin/debian/changelog index 1a1ede5..2f33e6a 100644 --- a/palemoon-ublock-origin/debian/changelog +++ b/palemoon-ublock-origin/debian/changelog @@ -1,3 +1,9 @@ +palemoon-ublock-origin (1.16.4.12-1+devuan) obs; urgency=low + + * Update + + -- B Stack <bgstack15@gmail.com> Wed, 18 Dec 2019 10:09:15 -0500 + palemoon-ublock-origin (1.16.4.11-1+devuan) manual; urgency=low * Update diff --git a/palemoon-ublock-origin/debian/compat b/palemoon-ublock-origin/debian/compat index b4de394..48082f7 100644 --- a/palemoon-ublock-origin/debian/compat +++ b/palemoon-ublock-origin/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/palemoon-ublock-origin/debian/control b/palemoon-ublock-origin/debian/control index a58a276..ba46875 100644 --- a/palemoon-ublock-origin/debian/control +++ b/palemoon-ublock-origin/debian/control @@ -2,7 +2,7 @@ Source: palemoon-ublock-origin Section: web Priority: optional Maintainer: B Stack <bgstack15@gmail.com> -Build-Depends: debhelper (>=11~), +Build-Depends: debhelper (>=12~), unzip, make Standards-Version: 4.1.4 diff --git a/palemoon-ublock-origin/debian/files b/palemoon-ublock-origin/debian/files index 786a923..a04d3ec 100644 --- a/palemoon-ublock-origin/debian/files +++ b/palemoon-ublock-origin/debian/files @@ -1,2 +1,2 @@ -palemoon-ublock-origin_1.16.4.11-1+devuan_all.deb web optional -palemoon-ublock-origin_1.16.4.11-1+devuan_amd64.buildinfo web optional +palemoon-ublock-origin_1.16.4.12-1+devuan_all.deb web optional +palemoon-ublock-origin_1.16.4.12-1+devuan_amd64.buildinfo web optional diff --git a/palemoon-ublock-origin/palemoon-ublock-origin.spec b/palemoon-ublock-origin/palemoon-ublock-origin.spec index cada7bd..8b45344 100644 --- a/palemoon-ublock-origin/palemoon-ublock-origin.spec +++ b/palemoon-ublock-origin/palemoon-ublock-origin.spec @@ -4,7 +4,7 @@ #%%global app_id Name: %{app_name}-ublock-origin -Version: 1.16.4.11 +Version: 1.16.4.12 Release: 1 Summary: uBlock Origin installed to the system Pale Moon extensions directory @@ -51,6 +51,9 @@ rm -rf %{buildroot} %{moz_extensions}/*.xpi %changelog +* Wed Dec 18 2019 B Stack <bgstack15@gmail.com> - 1.16.4.12-1 +- Update + * Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 1.16.4.11-1 - Update diff --git a/waterfox-ublock-origin/waterfox-ublock-origin.spec b/waterfox-ublock-origin/waterfox-ublock-origin.spec index 78cdd4a..0d05a2e 100644 --- a/waterfox-ublock-origin/waterfox-ublock-origin.spec +++ b/waterfox-ublock-origin/waterfox-ublock-origin.spec @@ -4,7 +4,7 @@ %global app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} Name: %{app_name}-ublock-origin -Version: 1.16.4.11 +Version: 1.16.4.12 Release: 1 Summary: uBlock Origin installed to system Waterfox extensions directory @@ -51,6 +51,9 @@ rm -rf %{buildroot} %{moz_extensions}/*/*.xpi %changelog +* Wed Dec 18 2019 B Stack <bgstack15@gmail.com> - 1.16.4.12-1 +- Update + * Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 1.16.4.11-1 - Update diff --git a/waterfox/README.md b/waterfox/README.md index 07101f8..77a9b01 100644 --- a/waterfox/README.md +++ b/waterfox/README.md @@ -1,12 +1,14 @@ # Waterfox upstream https://github.com/MrAlex94/Waterfox/archive Maintained in parallel to https://github.com/PhantomX/chinforpms/blob/master/waterfox/waterfox.spec +https://github.com/hawkeye116477/waterfox-deb/tree/master/waterfox-classic-kpe # Reason for being in stackrpms My distros do not package Waterfox, so I build it for myself. # Alternatives Palemoon is another Mozilla Firefox fork. +https://build.opensuse.org/package/view_file/home:hawkeye116477:waterfox/waterfox-current-kpe/rust_1.39.patch?expand=1 # Reverse dependency matrix Distro | Waterfox version @@ -14,6 +16,7 @@ Distro | Waterfox version All | 2019.10-classic # Differences from upstream +## rpm View the output of script [stackrpms-diff.sh](stackrpms-diff.sh) with this command: cd ~/dev diff --git a/waterfox/debian/README.debian b/waterfox/debian/README.debian new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/waterfox/debian/README.debian diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog index aac7a26..79eff80 100644 --- a/waterfox/debian/changelog +++ b/waterfox/debian/changelog @@ -1,3 +1,23 @@ +waterfox (2019.12-1+devuan) obs; urgency=medium + + - Classic branch + * New features: + * Restart button in PanelUI and Menu + * Copy current tab URL + * Copy all tab URLs + * New advanced settings in Features tab + * Added settings for blocking notifications and exceptions + * Added settings for disabling loading images automatically and exceptions + * Added settings for disabling JavaScript with exceptions and advanced settings + * Added new privacy settings + * Added possibility to disable search bar on new tab page + * Containers support enabled + * Added support for new emoji in Unicode/Emoji 12 + * Storage API enabled + * Security patches + + -- B Stack <bgstack15@gmail.com> Wed, 18 Dec 2019 11:44:32 -0500 + waterfox (56.2.14-1+devuan) obs; urgency=medium * This a security release, which brings Waterfox inline with security patches from ESR 60.9 diff --git a/waterfox/debian/compat b/waterfox/debian/compat index ec63514..48082f7 100644 --- a/waterfox/debian/compat +++ b/waterfox/debian/compat @@ -1 +1 @@ -9 +12 diff --git a/waterfox/debian/control b/waterfox/debian/control index fafa467..f9736d9 100644 --- a/waterfox/debian/control +++ b/waterfox/debian/control @@ -3,13 +3,13 @@ Section: web Priority: optional Maintainer: B Stack <bgstack15@gmail.com> XSBC-Original-Maintainer: Steven Pusser <stevep@mxlinux.org> -Build-Depends: autoconf2.13, +Build-Depends: debhelper (>= 12), + autoconf2.13, autotools-dev, binutils-avr, cargo (>= 0.25), ccache, clang-6.0, - debhelper (>= 9.20160114), dpkg-dev (>= 1.16.1.1~), libasound2-dev, libbz2-dev, @@ -46,15 +46,15 @@ Build-Depends: autoconf2.13, zip, zlib1g-dev Standards-Version: 3.9.7 -Homepage: https://www.waterfoxproject.org/ +Homepage: https://www.waterfox.net/ Package: waterfox Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: waterfox-kde Replaces: waterfox-kde -Provides: www-browser, gnome-www-browser -Suggests: fonts-lyx, libasound2, pulseaudio, waterfox-kde +Provides: www-browser, gnome-www-browser, waterfox-classic +Suggests: fonts-lyx, libasound2, pulseaudio Description: Free, open and private browser Waterfox focuses on giving users choice while also helping make the world a better place. Watefox is partners with Ecosia, a search engine that plants trees @@ -64,504 +64,3 @@ Description: Free, open and private browser to Mozilla or the Waterfox project. . Waterfox is powered by Mozilla Firefox source code. - . - Note: Language packs are available as separate packages! - -#Package: waterfox-locale-ach -#Architecture: all -#Depends: ${misc:Depends} -#Description: Acholi language pack for Waterfox -# This package contains Acholi translations for Waterfox - -#Package: waterfox-locale-af -#Architecture: all -#Depends: ${misc:Depends} -#Description: Afrikaans language pack for Waterfox -# This package contains Afrikaans translations for Waterfox - -#Package: waterfox-locale-an -#Architecture: all -#Depends: ${misc:Depends} -#Description: Aragonese language pack for Waterfox -# This package contains Aragonese translations for Waterfox - -#Package: waterfox-locale-ar -#Architecture: all -#Depends: ${misc:Depends} -#Description: Arabic language pack for Waterfox -# This package contains Arabic translations for Waterfox - -#Package: waterfox-locale-as -#Architecture: all -#Depends: ${misc:Depends} -#Description: Assamese language pack for Waterfox -# This package contains Assamese translations for Waterfox - -#Package: waterfox-locale-ast -#Architecture: all -#Depends: ${misc:Depends} -#Description: Asturian language pack for Waterfox -# This package contains Asturian translations for Waterfox - -#Package: waterfox-locale-az -#Architecture: all -#Depends: ${misc:Depends} -#Description: Azerbaijani language pack for Waterfox -# This package contains Azerbaijani translations for Waterfox - -#Package: waterfox-locale-bg -#Architecture: all -#Depends: ${misc:Depends} -#Description: Bulgarian language pack for Waterfox -# This package contains Bulgarian translations for Waterfox - -#Package: waterfox-locale-bn -#Architecture: all -#Depends: ${misc:Depends} -#Description: Bengali language pack for Waterfox -# This package contains Bengali translations for Waterfox - -#Package: waterfox-locale-br -#Architecture: all -#Depends: ${misc:Depends} -#Description: Breton language pack for Waterfox -# This package contains Breton translations for Waterfox - -#Package: waterfox-locale-bs -#Architecture: all -#Depends: ${misc:Depends} -#Description: Bosnian language pack for Waterfox -# This package contains Bosnian translations for Waterfox - -#Package: waterfox-locale-ca -#Architecture: all -#Depends: ${misc:Depends} -#Description: Catalan; Valencian language pack for Waterfox -# This package contains Catalan; Valencian translations for Waterfox - -#Package: waterfox-locale-cak -#Architecture: all -#Depends: ${misc:Depends} -#Description: Kaqchikel language pack for Waterfox -# This package contains Kaqchikel translations for Waterfox - -#Package: waterfox-locale-cs -#Architecture: all -#Depends: ${misc:Depends} -#Description: Czech language pack for Waterfox -# This package contains Czech translations for Waterfox - -#Package: waterfox-locale-cy -#Architecture: all -#Depends: ${misc:Depends} -#Description: Welsh language pack for Waterfox -# This package contains Welsh translations for Waterfox - -#Package: waterfox-locale-da -#Architecture: all -#Depends: ${misc:Depends} -#Description: Danish language pack for Waterfox -# This package contains Danish translations for Waterfox - -#Package: waterfox-locale-de -#Architecture: all -#Depends: ${misc:Depends} -#Description: German language pack for Waterfox -# This package contains German translations for Waterfox - -#Package: waterfox-locale-dsb -#Architecture: all -#Depends: ${misc:Depends} -#Description: Lower Sorbian language pack for Waterfox -# This package contains Lower Sorbian translations for Waterfox - -#Package: waterfox-locale-el -#Architecture: all -#Depends: ${misc:Depends} -#Description: Greek language pack for Waterfox -# This package contains Greek translations for Waterfox - -#Package: waterfox-locale-en -#Architecture: all -#Depends: ${misc:Depends} -#Description: English language pack for Waterfox -# This package contains English translations for Waterfox - -#Package: waterfox-locale-eo -#Architecture: all -#Depends: ${misc:Depends} -#Description: Esperanto language pack for Waterfox -# This package contains Esperanto translations for Waterfox - -#Package: waterfox-locale-es -#Architecture: all -#Depends: ${misc:Depends} -#Description: Spanish; Castilian language pack for Waterfox -# This package contains Spanish; Castilian translations for Waterfox - -#Package: waterfox-locale-et -#Architecture: all -#Depends: ${misc:Depends} -#Description: Estonian language pack for Waterfox -# This package contains Estonian translations for Waterfox - -#Package: waterfox-locale-eu -#Architecture: all -#Depends: ${misc:Depends} -#Description: Basque language pack for Waterfox -# This package contains Basque translations for Waterfox - -#Package: waterfox-locale-fa -#Architecture: all -#Depends: ${misc:Depends} -#Description: Persian language pack for Waterfox -# This package contains Persian translations for Waterfox - -#Package: waterfox-locale-ff -#Architecture: all -#Depends: ${misc:Depends} -#Description: Fulah language pack for Waterfox -# This package contains Fulah translations for Waterfox - -#Package: waterfox-locale-fi -#Architecture: all -#Depends: ${misc:Depends} -#Description: Finnish language pack for Waterfox -# This package contains Finnish translations for Waterfox - -#Package: waterfox-locale-fr -#Architecture: all -#Depends: ${misc:Depends} -#Description: French language pack for Waterfox -# This package contains French translations for Waterfox - -#Package: waterfox-locale-fy -#Architecture: all -#Depends: ${misc:Depends} -#Description: Western Frisian language pack for Waterfox -# This package contains Western Frisian translations for Waterfox - -#Package: waterfox-locale-ga -#Architecture: all -#Depends: ${misc:Depends} -#Description: Irish (Ireland) language pack for Waterfox -# This package contains Irish (Ireland) translations for Waterfox - -#Package: waterfox-locale-gd -#Architecture: all -#Depends: ${misc:Depends} -#Description: Gaelic; Scottish Gaelic language pack for Waterfox -# This package contains Gaelic; Scottish Gaelic translations for Waterfox - -#Package: waterfox-locale-gl -#Architecture: all -#Depends: ${misc:Depends} -#Description: Galician language pack for Waterfox -# This package contains Galician translations for Waterfox - -#Package: waterfox-locale-gn -#Architecture: all -#Depends: ${misc:Depends} -#Description: Guarani language pack for Waterfox -# This package contains Guarani translations for Waterfox - -#Package: waterfox-locale-gu -#Architecture: all -#Depends: ${misc:Depends} -#Description: Gujarati (India) language pack for Waterfox -# This package contains Gujarati (India) translations for Waterfox - -#Package: waterfox-locale-he -#Architecture: all -#Depends: ${misc:Depends} -#Description: Hebrew language pack for Waterfox -# This package contains Hebrew translations for Waterfox - -#Package: waterfox-locale-hi -#Architecture: all -#Depends: ${misc:Depends} -#Description: Hindi (India) language pack for Waterfox -# This package contains Hindi (India) translations for Waterfox - -#Package: waterfox-locale-hr -#Architecture: all -#Depends: ${misc:Depends} -#Description: Croatian language pack for Waterfox -# This package contains Croatian translations for Waterfox - -#Package: waterfox-locale-hsb -#Architecture: all -#Depends: ${misc:Depends} -#Description: Sorbian, Upper language pack for Waterfox -# This package contains Sorbian, Upper translations for Waterfox - -#Package: waterfox-locale-hu -#Architecture: all -#Depends: ${misc:Depends} -#Description: Hungarian language pack for Waterfox -# This package contains Hungarian translations for Waterfox - -#Package: waterfox-locale-hy -#Architecture: all -#Depends: ${misc:Depends} -#Description: Armenian (Armenia) language pack for Waterfox -# This package contains Armenian (Armenia) translations for Waterfox - -#Package: waterfox-locale-id -#Architecture: all -#Depends: ${misc:Depends} -#Description: Indonesian language pack for Waterfox -# This package contains Indonesian translations for Waterfox - -#Package: waterfox-locale-is -#Architecture: all -#Depends: ${misc:Depends} -#Description: Icelandic language pack for Waterfox -# This package contains Icelandic translations for Waterfox - -#Package: waterfox-locale-it -#Architecture: all -#Depends: ${misc:Depends} -#Description: Italian language pack for Waterfox -# This package contains Italian translations for Waterfox - -#Package: waterfox-locale-ja -#Architecture: all -#Depends: ${misc:Depends} -#Description: Japanese language pack for Waterfox -# This package contains Japanese translations for Waterfox - -#Package: waterfox-locale-kk -#Architecture: all -#Depends: ${misc:Depends} -#Description: Kazakh language pack for Waterfox -# This package contains Kazakh translations for Waterfox - -#Package: waterfox-locale-km -#Architecture: all -#Depends: ${misc:Depends} -#Description: Central Khmer language pack for Waterfox -# This package contains Central Khmer translations for Waterfox - -#Package: waterfox-locale-kn -#Architecture: all -#Depends: ${misc:Depends} -#Description: Kannada language pack for Waterfox -# This package contains Kannada translations for Waterfox - -#Package: waterfox-locale-ko -#Architecture: all -#Depends: ${misc:Depends} -#Description: Korean language pack for Waterfox -# This package contains Korean translations for Waterfox - -#Package: waterfox-locale-lij -#Architecture: all -#Depends: ${misc:Depends} -#Description: Ligurian language pack for Waterfox -# This package contains Ligurian translations for Waterfox - -#Package: waterfox-locale-lt -#Architecture: all -#Depends: ${misc:Depends} -#Description: Lithuanian language pack for Waterfox -# This package contains Lithuanian translations for Waterfox - -#Package: waterfox-locale-lv -#Architecture: all -#Depends: ${misc:Depends} -#Description: Latvian language pack for Waterfox -# This package contains Latvian translations for Waterfox - -#Package: waterfox-locale-mai -#Architecture: all -#Depends: ${misc:Depends} -#Description: Maithili language pack for Waterfox -# This package contains Maithili translations for Waterfox - -#Package: waterfox-locale-mk -#Architecture: all -#Depends: ${misc:Depends} -#Description: Macedonian language pack for Waterfox -# This package contains Macedonian translations for Waterfox - -#Package: waterfox-locale-ml -#Architecture: all -#Depends: ${misc:Depends} -#Description: Malayalam language pack for Waterfox -# This package contains Malayalam translations for Waterfox - -#Package: waterfox-locale-mr -#Architecture: all -#Depends: ${misc:Depends} -#Description: Marathi language pack for Waterfox -# This package contains Marathi translations for Waterfox - -#Package: waterfox-locale-ms -#Architecture: all -#Depends: ${misc:Depends} -#Description: Malay language pack for Waterfox -# This package contains Malay translations for Waterfox - -#Package: waterfox-locale-nb -#Architecture: all -#Depends: ${misc:Depends} -#Description: Bokmål, Norwegian; Norwegian Bokmål language pack for Waterfox -# This package contains Bokmål, Norwegian; Norwegian Bokmål translations for Waterfox - -#Package: waterfox-locale-nl -#Architecture: all -#Depends: ${misc:Depends} -#Description: Dutch; Flemish language pack for Waterfox -# This package contains Dutch; Flemish translations for Waterfox - -#Package: waterfox-locale-nn -#Architecture: all -#Depends: ${misc:Depends} -#Description: Norwegian Nynorsk; Nynorsk, Norwegian language pack for Waterfox -# This package contains Norwegian Nynorsk; Nynorsk, Norwegian translations for Waterfox - -#Package: waterfox-locale-or -#Architecture: all -#Depends: ${misc:Depends} -#Description: Oriya language pack for Waterfox -# This package contains Oriya translations for Waterfox - -#Package: waterfox-locale-pa -#Architecture: all -#Depends: ${misc:Depends} -#Description: Panjabi; Punjabi (India) language pack for Waterfox -# This package contains Panjabi; Punjabi (India) translations for Waterfox - -#Package: waterfox-locale-pl -#Architecture: all -#Depends: ${misc:Depends} -#Description: Polish language pack for Waterfox -# This package contains Polish translations for Waterfox - -#Package: waterfox-locale-pt -#Architecture: all -#Depends: ${misc:Depends} -#Description: Portuguese language pack for Waterfox -# This package contains Portuguese translations for Waterfox - -#Package: waterfox-locale-rm -#Architecture: all -#Depends: ${misc:Depends} -#Description: Romansh language pack for Waterfox -# This package contains Romansh translations for Waterfox - -#Package: waterfox-locale-ro -#Architecture: all -#Depends: ${misc:Depends} -#Description: Romanian language pack for Waterfox -# This package contains Romanian translations for Waterfox - -#Package: waterfox-locale-ru -#Architecture: all -#Depends: ${misc:Depends} -#Description: Russian language pack for Waterfox -# This package contains Russian translations for Waterfox - -#Package: waterfox-locale-si -#Architecture: all -#Depends: ${misc:Depends} -#Description: Sinhala; Sinhalese language pack for Waterfox -# This package contains Sinhala; Sinhalese translations for Waterfox - -#Package: waterfox-locale-sk -#Architecture: all -#Depends: ${misc:Depends} -#Description: Slovak language pack for Waterfox -# This package contains Slovak translations for Waterfox - -#Package: waterfox-locale-sl -#Architecture: all -#Depends: ${misc:Depends} -#Description: Slovenian language pack for Waterfox -# This package contains Slovenian translations for Waterfox - -#Package: waterfox-locale-son -#Architecture: all -#Depends: ${misc:Depends} -#Description: Songhai language pack for Waterfox -# This package contains Songhai translations for Waterfox - -#Package: waterfox-locale-sq -#Architecture: all -#Depends: ${misc:Depends} -#Description: Albanian language pack for Waterfox -# This package contains Albanian translations for Waterfox - -#Package: waterfox-locale-sr -#Architecture: all -#Depends: ${misc:Depends} -#Description: Serbian language pack for Waterfox -# This package contains Serbian translations for Waterfox - -#Package: waterfox-locale-sv -#Architecture: all -#Depends: ${misc:Depends} -#Description: Swedish (Sweden) language pack for Waterfox -# This package contains Swedish (Sweden) translations for Waterfox - -#Package: waterfox-locale-ta -#Architecture: all -#Depends: ${misc:Depends} -#Description: Tamil language pack for Waterfox -# This package contains Tamil translations for Waterfox - -#Package: waterfox-locale-te -#Architecture: all -#Depends: ${misc:Depends} -#Description: Telugu language pack for Waterfox -# This package contains Telugu translations for Waterfox - -#Package: waterfox-locale-th -#Architecture: all -#Depends: ${misc:Depends} -#Description: Thai language pack for Waterfox -# This package contains Thai translations for Waterfox - -#Package: waterfox-locale-tr -#Architecture: all -#Depends: ${misc:Depends} -#Description: Turkish language pack for Waterfox -# This package contains Turkish translations for Waterfox - -#Package: waterfox-locale-uk -#Architecture: all -#Depends: ${misc:Depends} -#Description: Ukrainian language pack for Waterfox -# This package contains Ukrainian translations for Waterfox - -#Package: waterfox-locale-uz -#Architecture: all -#Depends: ${misc:Depends} -#Description: Uzbek language pack for Waterfox -# This package contains Uzbek translations for Waterfox - -#Package: waterfox-locale-vi -#Architecture: all -#Depends: ${misc:Depends} -#Description: Vietnamese language pack for Waterfox -# This package contains Vietnamese translations for Waterfox - -#Package: waterfox-locale-xh -#Architecture: all -#Depends: ${misc:Depends} -#Description: Xhosa language pack for Waterfox -# This package contains Xhosa translations for Waterfox - -#Package: waterfox-locale-zh-hans -#Architecture: all -#Depends: ${misc:Depends} -#Description: Simplified Chinese language pack for Waterfox -# This package contains Simplified Chinese translations for Waterfox - -#Package: waterfox-locale-zh-hant -#Architecture: all -#Depends: ${misc:Depends} -#Description: Traditional Chinese language pack for Waterfox -# This package contains Traditional Chinese translations for Waterfox - diff --git a/waterfox/debian/credits.md b/waterfox/debian/credits.md index fb27d01..feb6a61 100644 --- a/waterfox/debian/credits.md +++ b/waterfox/debian/credits.md @@ -1,3 +1,5 @@ Hawkeye116477 * https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox/control Build-Depends: debhelper (>= 9), autoconf2.13, libgtk-3-dev (>= 3.4), libgconf2-dev, libdbus-glib-1-dev, libpulse-dev, libasound2-dev, yasm (>= 1.1), build-essential, libgtk2.0-dev (>= 2.10), libxt-dev, python2.7, python-minimal (>= 2.6.6-13~), python-ply, zip, unzip, ccache, cargo (>= 0.25), libgl1-mesa-dev, libnotify-dev, binutils-avr, libfreetype6-dev, libfontconfig1-dev, pkg-config, libtinfo-dev, clang-6.0 | clang-4.0, llvm-6.0-dev | llvm-4.0-dev, rustc (>= 1.24), libxext-dev, libglib2.0-dev (>= 2.16.0), libpango1.0-dev, libstartup-notification0-dev, libcurl4-openssl-dev, libiw-dev, mesa-common-dev, libxrender-dev, dbus-x11, xvfb, libx11-dev, libx11-xcb-dev, libfile-fcntllock-perl, apt-utils, locales, autotools-dev, libjpeg-dev, zlib1g-dev, libreadline-dev, dpkg-dev (>= 1.16.1.1~), libevent-dev (>= 1.4.1), libjsoncpp-dev, xfonts-base, xauth, lsb-release + +https://build.opensuse.org/package/view_file/home:hawkeye116477:waterfox/waterfox-current-kpe/rust_1.39.patch?expand=1 diff --git a/waterfox/debian/mozconfig b/waterfox/debian/mozconfig index e2a51c9..0b6416a 100644 --- a/waterfox/debian/mozconfig +++ b/waterfox/debian/mozconfig @@ -30,7 +30,9 @@ ac_add_options --enable-release #ac_add_options --enable-rust-simd # on x86 requires SSE2 ac_add_options --disable-rust-simd -ac_add_options --enable-stylo=build +#ac_add_options --enable-stylo=build +# turn off stylo for 2019.12-classic with rust 1.39 +ac_add_options --disable-stylo ac_add_options --with-app-name=waterfox ac_add_options --with-app-basename=Waterfox diff --git a/waterfox/debian/rules b/waterfox/debian/rules index 46d35b1..7e4cff5 100755 --- a/waterfox/debian/rules +++ b/waterfox/debian/rules @@ -20,8 +20,9 @@ override_dh_auto_build: override_dh_auto_install: chmod +x $$(pwd)/debian/waterfox-bin.sh DESTDIR=$$(pwd)/debian/waterfox ./mach install + #mv $$(pwd)/debian/usr/bin/waterfox-classic $$(pwd)/debian/usr/bin/waterfox || : mv $$(pwd)/debian/waterfox/usr/lib/waterfox/browser/features/ $$(pwd) - rm -rf $$(pwd)/debian/waterfox/usr/lib/waterfox/waterfox-bin + rm -rf $$(pwd)/debian/waterfox/usr/lib/waterfox/waterfox-classic-bin rm -rf $$(pwd)/debian/waterfox/usr/lib/waterfox/dictionaries override_dh_shlibdeps: diff --git a/waterfox/debian/waterfox-locale-ach.install b/waterfox/debian/waterfox-locale-ach.install deleted file mode 100644 index a0408a4..0000000 --- a/waterfox/debian/waterfox-locale-ach.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-ach@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-af.install b/waterfox/debian/waterfox-locale-af.install deleted file mode 100644 index 1122092..0000000 --- a/waterfox/debian/waterfox-locale-af.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-af@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-an.install b/waterfox/debian/waterfox-locale-an.install deleted file mode 100644 index 1021f74..0000000 --- a/waterfox/debian/waterfox-locale-an.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-an@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-ar.install b/waterfox/debian/waterfox-locale-ar.install deleted file mode 100644 index 9e3714e..0000000 --- a/waterfox/debian/waterfox-locale-ar.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-ar@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-as.install b/waterfox/debian/waterfox-locale-as.install deleted file mode 100644 index 75ad992..0000000 --- a/waterfox/debian/waterfox-locale-as.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-as@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-ast.install b/waterfox/debian/waterfox-locale-ast.install deleted file mode 100644 index 5bbe5e9..0000000 --- a/waterfox/debian/waterfox-locale-ast.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-ast@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-az.install b/waterfox/debian/waterfox-locale-az.install deleted file mode 100644 index 865f98c..0000000 --- a/waterfox/debian/waterfox-locale-az.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-az@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-bg.install b/waterfox/debian/waterfox-locale-bg.install deleted file mode 100644 index 8c419e5..0000000 --- a/waterfox/debian/waterfox-locale-bg.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-bg@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-bn.install b/waterfox/debian/waterfox-locale-bn.install deleted file mode 100644 index ea04517..0000000 --- a/waterfox/debian/waterfox-locale-bn.install +++ /dev/null @@ -1,2 +0,0 @@ -features/langpack-bn-BD@waterfox.xpi /usr/lib/waterfox/browser/features -features/langpack-bn-IN@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-br.install b/waterfox/debian/waterfox-locale-br.install deleted file mode 100644 index 8270a01..0000000 --- a/waterfox/debian/waterfox-locale-br.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-br@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-bs.install b/waterfox/debian/waterfox-locale-bs.install deleted file mode 100644 index 401b616..0000000 --- a/waterfox/debian/waterfox-locale-bs.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-bs@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-ca.install b/waterfox/debian/waterfox-locale-ca.install deleted file mode 100644 index 22f510a..0000000 --- a/waterfox/debian/waterfox-locale-ca.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-ca@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-cak.install b/waterfox/debian/waterfox-locale-cak.install deleted file mode 100644 index c015323..0000000 --- a/waterfox/debian/waterfox-locale-cak.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-cak@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-cs.install b/waterfox/debian/waterfox-locale-cs.install deleted file mode 100644 index 7b5388c..0000000 --- a/waterfox/debian/waterfox-locale-cs.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-cs@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-cy.install b/waterfox/debian/waterfox-locale-cy.install deleted file mode 100644 index 7ed9fa0..0000000 --- a/waterfox/debian/waterfox-locale-cy.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-cy@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-da.install b/waterfox/debian/waterfox-locale-da.install deleted file mode 100644 index f6a76e9..0000000 --- a/waterfox/debian/waterfox-locale-da.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-da@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-de.install b/waterfox/debian/waterfox-locale-de.install deleted file mode 100644 index 0f11dc7..0000000 --- a/waterfox/debian/waterfox-locale-de.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-de@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-dsb.install b/waterfox/debian/waterfox-locale-dsb.install deleted file mode 100644 index 58d7323..0000000 --- a/waterfox/debian/waterfox-locale-dsb.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-dsb@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-el.install b/waterfox/debian/waterfox-locale-el.install deleted file mode 100644 index 2ced187..0000000 --- a/waterfox/debian/waterfox-locale-el.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-el@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-en.install b/waterfox/debian/waterfox-locale-en.install deleted file mode 100644 index dddc685..0000000 --- a/waterfox/debian/waterfox-locale-en.install +++ /dev/null @@ -1,2 +0,0 @@ -features/langpack-en-GB@waterfox.xpi /usr/lib/waterfox/browser/features -features/langpack-en-ZA@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-eo.install b/waterfox/debian/waterfox-locale-eo.install deleted file mode 100644 index de71c64..0000000 --- a/waterfox/debian/waterfox-locale-eo.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-eo@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-es.install b/waterfox/debian/waterfox-locale-es.install deleted file mode 100644 index 37669fe..0000000 --- a/waterfox/debian/waterfox-locale-es.install +++ /dev/null @@ -1,4 +0,0 @@ -features/langpack-es-AR@waterfox.xpi /usr/lib/waterfox/browser/features -features/langpack-es-CL@waterfox.xpi /usr/lib/waterfox/browser/features -features/langpack-es-ES@waterfox.xpi /usr/lib/waterfox/browser/features -features/langpack-es-MX@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-et.install b/waterfox/debian/waterfox-locale-et.install deleted file mode 100644 index 0293670..0000000 --- a/waterfox/debian/waterfox-locale-et.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-et@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-eu.install b/waterfox/debian/waterfox-locale-eu.install deleted file mode 100644 index 09123a1..0000000 --- a/waterfox/debian/waterfox-locale-eu.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-eu@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-fa.install b/waterfox/debian/waterfox-locale-fa.install deleted file mode 100644 index 08a6031..0000000 --- a/waterfox/debian/waterfox-locale-fa.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-fa@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-ff.install b/waterfox/debian/waterfox-locale-ff.install deleted file mode 100644 index 997a557..0000000 --- a/waterfox/debian/waterfox-locale-ff.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-ff@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-fi.install b/waterfox/debian/waterfox-locale-fi.install deleted file mode 100644 index 5580e26..0000000 --- a/waterfox/debian/waterfox-locale-fi.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-fi@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-fr.install b/waterfox/debian/waterfox-locale-fr.install deleted file mode 100644 index 2036fce..0000000 --- a/waterfox/debian/waterfox-locale-fr.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-fr@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-fy.install b/waterfox/debian/waterfox-locale-fy.install deleted file mode 100644 index cf9984a..0000000 --- a/waterfox/debian/waterfox-locale-fy.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-fy-NL@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-ga.install b/waterfox/debian/waterfox-locale-ga.install deleted file mode 100644 index a07745d..0000000 --- a/waterfox/debian/waterfox-locale-ga.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-ga-IE@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-gd.install b/waterfox/debian/waterfox-locale-gd.install deleted file mode 100644 index 22786de..0000000 --- a/waterfox/debian/waterfox-locale-gd.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-gd@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-gl.install b/waterfox/debian/waterfox-locale-gl.install deleted file mode 100644 index 68d1be0..0000000 --- a/waterfox/debian/waterfox-locale-gl.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-gl@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-gn.install b/waterfox/debian/waterfox-locale-gn.install deleted file mode 100644 index dbe2e5a..0000000 --- a/waterfox/debian/waterfox-locale-gn.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-gn@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-gu.install b/waterfox/debian/waterfox-locale-gu.install deleted file mode 100644 index d6c5f7a..0000000 --- a/waterfox/debian/waterfox-locale-gu.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-gu-IN@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-he.install b/waterfox/debian/waterfox-locale-he.install deleted file mode 100644 index 30464e9..0000000 --- a/waterfox/debian/waterfox-locale-he.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-he@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-hi.install b/waterfox/debian/waterfox-locale-hi.install deleted file mode 100644 index 412edde..0000000 --- a/waterfox/debian/waterfox-locale-hi.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-hi-IN@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-hr.install b/waterfox/debian/waterfox-locale-hr.install deleted file mode 100644 index 9dc4eb9..0000000 --- a/waterfox/debian/waterfox-locale-hr.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-hr@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-hsb.install b/waterfox/debian/waterfox-locale-hsb.install deleted file mode 100644 index fb945b4..0000000 --- a/waterfox/debian/waterfox-locale-hsb.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-hsb@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-hu.install b/waterfox/debian/waterfox-locale-hu.install deleted file mode 100644 index 3f71034..0000000 --- a/waterfox/debian/waterfox-locale-hu.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-hu@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-hy.install b/waterfox/debian/waterfox-locale-hy.install deleted file mode 100644 index d344290..0000000 --- a/waterfox/debian/waterfox-locale-hy.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-hy-AM@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-id.install b/waterfox/debian/waterfox-locale-id.install deleted file mode 100644 index 482c61d..0000000 --- a/waterfox/debian/waterfox-locale-id.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-id@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-is.install b/waterfox/debian/waterfox-locale-is.install deleted file mode 100644 index dd4859a..0000000 --- a/waterfox/debian/waterfox-locale-is.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-is@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-it.install b/waterfox/debian/waterfox-locale-it.install deleted file mode 100644 index 825b982..0000000 --- a/waterfox/debian/waterfox-locale-it.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-it@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-ja.install b/waterfox/debian/waterfox-locale-ja.install deleted file mode 100644 index 26a1616..0000000 --- a/waterfox/debian/waterfox-locale-ja.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-ja@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-kk.install b/waterfox/debian/waterfox-locale-kk.install deleted file mode 100644 index 500dc4f..0000000 --- a/waterfox/debian/waterfox-locale-kk.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-kk@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-km.install b/waterfox/debian/waterfox-locale-km.install deleted file mode 100644 index 7e0172a..0000000 --- a/waterfox/debian/waterfox-locale-km.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-km@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-kn.install b/waterfox/debian/waterfox-locale-kn.install deleted file mode 100644 index 1ea5964..0000000 --- a/waterfox/debian/waterfox-locale-kn.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-kn@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-ko.install b/waterfox/debian/waterfox-locale-ko.install deleted file mode 100644 index f378f97..0000000 --- a/waterfox/debian/waterfox-locale-ko.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-ko@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-lij.install b/waterfox/debian/waterfox-locale-lij.install deleted file mode 100644 index a863225..0000000 --- a/waterfox/debian/waterfox-locale-lij.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-lij@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-lt.install b/waterfox/debian/waterfox-locale-lt.install deleted file mode 100644 index 48b1826..0000000 --- a/waterfox/debian/waterfox-locale-lt.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-lt@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-lv.install b/waterfox/debian/waterfox-locale-lv.install deleted file mode 100644 index a383f0e..0000000 --- a/waterfox/debian/waterfox-locale-lv.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-lv@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-mai.install b/waterfox/debian/waterfox-locale-mai.install deleted file mode 100644 index 3796238..0000000 --- a/waterfox/debian/waterfox-locale-mai.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-mai@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-mk.install b/waterfox/debian/waterfox-locale-mk.install deleted file mode 100644 index e0d007a..0000000 --- a/waterfox/debian/waterfox-locale-mk.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-mk@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-ml.install b/waterfox/debian/waterfox-locale-ml.install deleted file mode 100644 index 016b271..0000000 --- a/waterfox/debian/waterfox-locale-ml.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-ml@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-mr.install b/waterfox/debian/waterfox-locale-mr.install deleted file mode 100644 index 6c3d625..0000000 --- a/waterfox/debian/waterfox-locale-mr.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-mr@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-ms.install b/waterfox/debian/waterfox-locale-ms.install deleted file mode 100644 index 6118642..0000000 --- a/waterfox/debian/waterfox-locale-ms.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-ms@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-nb.install b/waterfox/debian/waterfox-locale-nb.install deleted file mode 100644 index 6ff671c..0000000 --- a/waterfox/debian/waterfox-locale-nb.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-nb-NO@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-nl.install b/waterfox/debian/waterfox-locale-nl.install deleted file mode 100644 index 428aaf7..0000000 --- a/waterfox/debian/waterfox-locale-nl.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-nl@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-nn.install b/waterfox/debian/waterfox-locale-nn.install deleted file mode 100644 index fc8df39..0000000 --- a/waterfox/debian/waterfox-locale-nn.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-nn-NO@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-or.install b/waterfox/debian/waterfox-locale-or.install deleted file mode 100644 index 140c471..0000000 --- a/waterfox/debian/waterfox-locale-or.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-or@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-pa.install b/waterfox/debian/waterfox-locale-pa.install deleted file mode 100644 index 994e269..0000000 --- a/waterfox/debian/waterfox-locale-pa.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-pa-IN@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-pl.install b/waterfox/debian/waterfox-locale-pl.install deleted file mode 100644 index 434b14f..0000000 --- a/waterfox/debian/waterfox-locale-pl.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-pl@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-pt.install b/waterfox/debian/waterfox-locale-pt.install deleted file mode 100644 index 224ea7c..0000000 --- a/waterfox/debian/waterfox-locale-pt.install +++ /dev/null @@ -1,2 +0,0 @@ -features/langpack-pt-BR@waterfox.xpi /usr/lib/waterfox/browser/features -features/langpack-pt-PT@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-rm.install b/waterfox/debian/waterfox-locale-rm.install deleted file mode 100644 index a23eae7..0000000 --- a/waterfox/debian/waterfox-locale-rm.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-rm@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-ro.install b/waterfox/debian/waterfox-locale-ro.install deleted file mode 100644 index b476750..0000000 --- a/waterfox/debian/waterfox-locale-ro.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-ro@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-ru.install b/waterfox/debian/waterfox-locale-ru.install deleted file mode 100644 index 7135201..0000000 --- a/waterfox/debian/waterfox-locale-ru.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-ru@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-si.install b/waterfox/debian/waterfox-locale-si.install deleted file mode 100644 index 2791328..0000000 --- a/waterfox/debian/waterfox-locale-si.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-si@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-sk.install b/waterfox/debian/waterfox-locale-sk.install deleted file mode 100644 index 2febe3d..0000000 --- a/waterfox/debian/waterfox-locale-sk.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-sk@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-sl.install b/waterfox/debian/waterfox-locale-sl.install deleted file mode 100644 index 707a344..0000000 --- a/waterfox/debian/waterfox-locale-sl.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-sl@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-son.install b/waterfox/debian/waterfox-locale-son.install deleted file mode 100644 index 18860dc..0000000 --- a/waterfox/debian/waterfox-locale-son.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-son@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-sq.install b/waterfox/debian/waterfox-locale-sq.install deleted file mode 100644 index 00b488b..0000000 --- a/waterfox/debian/waterfox-locale-sq.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-sq@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-sr.install b/waterfox/debian/waterfox-locale-sr.install deleted file mode 100644 index 7092356..0000000 --- a/waterfox/debian/waterfox-locale-sr.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-sr@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-sv.install b/waterfox/debian/waterfox-locale-sv.install deleted file mode 100644 index e7feb76..0000000 --- a/waterfox/debian/waterfox-locale-sv.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-sv-SE@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-ta.install b/waterfox/debian/waterfox-locale-ta.install deleted file mode 100644 index 540b601..0000000 --- a/waterfox/debian/waterfox-locale-ta.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-ta@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-te.install b/waterfox/debian/waterfox-locale-te.install deleted file mode 100644 index 01b1f47..0000000 --- a/waterfox/debian/waterfox-locale-te.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-te@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-th.install b/waterfox/debian/waterfox-locale-th.install deleted file mode 100644 index 520b1fc..0000000 --- a/waterfox/debian/waterfox-locale-th.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-th@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-tr.install b/waterfox/debian/waterfox-locale-tr.install deleted file mode 100644 index 26833e4..0000000 --- a/waterfox/debian/waterfox-locale-tr.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-tr@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-uk.install b/waterfox/debian/waterfox-locale-uk.install deleted file mode 100644 index ddfcd57..0000000 --- a/waterfox/debian/waterfox-locale-uk.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-uk@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-uz.install b/waterfox/debian/waterfox-locale-uz.install deleted file mode 100644 index dd796e8..0000000 --- a/waterfox/debian/waterfox-locale-uz.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-uz@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-vi.install b/waterfox/debian/waterfox-locale-vi.install deleted file mode 100644 index 0bf75f5..0000000 --- a/waterfox/debian/waterfox-locale-vi.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-vi@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-xh.install b/waterfox/debian/waterfox-locale-xh.install deleted file mode 100644 index c30034f..0000000 --- a/waterfox/debian/waterfox-locale-xh.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-xh@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-zh-hans.install b/waterfox/debian/waterfox-locale-zh-hans.install deleted file mode 100644 index dd774a4..0000000 --- a/waterfox/debian/waterfox-locale-zh-hans.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-zh-CN@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox-locale-zh-hant.install b/waterfox/debian/waterfox-locale-zh-hant.install deleted file mode 100644 index 79707ad..0000000 --- a/waterfox/debian/waterfox-locale-zh-hant.install +++ /dev/null @@ -1 +0,0 @@ -features/langpack-zh-TW@waterfox.xpi /usr/lib/waterfox/browser/features diff --git a/waterfox/debian/waterfox.dsc b/waterfox/debian/waterfox.dsc index 17156b2..b30ce9d 100644 --- a/waterfox/debian/waterfox.dsc +++ b/waterfox/debian/waterfox.dsc @@ -4,7 +4,7 @@ Binary: waterfox Architecture: any Version: 56.2.4-0 Maintainer: hawkeye116477 <hawkeye116477@gmail.com> -Homepage: https://www.waterfoxproject.org/ +Homepage: https://www.waterfox.net/ Standards-Version: 3.9.7 Build-Depends: debhelper (>= 9), autoconf2.13, libgtk-3-dev (>= 3.4), libgconf2-dev, libdbus-glib-1-dev, libpulse-dev, libasound2-dev, yasm (>= 1.1), build-essential, libgtk2.0-dev (>= 2.10), libxt-dev, python2.7, python-minimal (>= 2.6.6-13~), python-ply, zip, unzip, ccache, cargo (>= 0.25), libgl1-mesa-dev, libnotify-dev, binutils-avr, libfreetype6-dev, libfontconfig1-dev, pkg-config, libtinfo-dev, clang-6.0 | clang-4.0, llvm-6.0-dev | llvm-4.0-dev, rustc (>= 1.24), libxext-dev, libglib2.0-dev (>= 2.16.0), libpango1.0-dev, libstartup-notification0-dev, libcurl4-openssl-dev, libiw-dev, mesa-common-dev, libxrender-dev, dbus-x11, xvfb, libx11-dev, libx11-xcb-dev, libfile-fcntllock-perl, apt-utils, locales, autotools-dev, libjpeg-dev, zlib1g-dev, libreadline-dev, dpkg-dev (>= 1.16.1.1~), libevent-dev (>= 1.4.1), libjsoncpp-dev, xfonts-base, xauth, lsb-release Package-List: diff --git a/waterfox/debian/waterfox.links b/waterfox/debian/waterfox.links index 7723052..50fa52a 100644 --- a/waterfox/debian/waterfox.links +++ b/waterfox/debian/waterfox.links @@ -1,12 +1,13 @@ # Icons -usr/lib/waterfox/browser/icons/mozicon128.png usr/share/pixmaps/waterfox.png usr/lib/waterfox/browser/chrome/icons/default/default16.png usr/share/icons/hicolor/16x16/apps/waterfox.png usr/lib/waterfox/browser/chrome/icons/default/default22.png usr/share/icons/hicolor/22x22/apps/waterfox.png usr/lib/waterfox/browser/chrome/icons/default/default24.png usr/share/icons/hicolor/24x24/apps/waterfox.png usr/lib/waterfox/browser/chrome/icons/default/default32.png usr/share/icons/hicolor/32x32/apps/waterfox.png usr/lib/waterfox/browser/chrome/icons/default/default48.png usr/share/icons/hicolor/48x48/apps/waterfox.png +usr/lib/waterfox/browser/chrome/icons/default/default64.png usr/share/icons/hicolor/64x64/apps/waterfox.png +usr/lib/waterfox/browser/chrome/icons/default/default128.png usr/share/icons/hicolor/128x128/apps/waterfox.png usr/lib/waterfox/browser/chrome/icons/default/default256.png usr/share/icons/hicolor/256x256/apps/waterfox.png -usr/lib/waterfox/browser/icons/mozicon128.png usr/share/icons/hicolor/128x128/apps/waterfox.png +usr/lib/waterfox/browser/chrome/icons/default/default128.png usr/share/pixmaps/waterfox.png # System dictionaries usr/share/hunspell usr/lib/waterfox/dictionaries diff --git a/waterfox/distribution.ini b/waterfox/distribution.ini index 6f41252..07ddedc 100644 --- a/waterfox/distribution.ini +++ b/waterfox/distribution.ini @@ -1,7 +1,7 @@ [Global] id=stackrpms version=1.0 -about=Waterfox for Fedora +about=Waterfox _BRANCH_ for Fedora [Preferences] app.distributor=stackrpms diff --git a/waterfox/stackrpms-diff.sh b/waterfox/stackrpms-diff.sh index 851f840..0a90beb 100755 --- a/waterfox/stackrpms-diff.sh +++ b/waterfox/stackrpms-diff.sh @@ -1,3 +1,3 @@ # use this file to display the differences between chinfo upstream and my work. # usage: stackrpms/waterfox/stackrpms-diff.sh | vi - -diff -x debian -x stackrpms*.diff -x stackrpms*.sh -x *z -x .*.swp -Naur chinforpms/waterfox stackrpms/waterfox +diff -x 'README.md' -x 'bgstack15-waterfox-prefs.js' -x debian -x stackrpms*.diff -x stackrpms*.sh -x *z -x .*.swp -Naur chinforpms/waterfox stackrpms/waterfox diff --git a/waterfox/waterfox-disable-diagnostics-color.patch b/waterfox/waterfox-disable-diagnostics-color.patch new file mode 100644 index 0000000..84e8c92 --- /dev/null +++ b/waterfox/waterfox-disable-diagnostics-color.patch @@ -0,0 +1,31 @@ +From 0bf3ae1ba71921b3725c0ac2830bbe5cbdb95656 Mon Sep 17 00:00:00 2001 +From: Phantom X <PhantomX@users.noreply.github.com> +Date: Wed, 11 Dec 2019 11:45:18 -0300 +Subject: [PATCH] Disable diagnostics color output + +This dump a lot of garbage in mock logs +--- + build/moz.configure/toolchain.configure | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure +index a31acb7..10868e0 100755 +--- a/build/moz.configure/toolchain.configure ++++ b/build/moz.configure/toolchain.configure +@@ -969,12 +969,7 @@ def color_cflags(info): + # value changes to e.g. "<x>=always", exact string match may fail and + # multiple color flags could be added. So examine downstream consumers + # before adding flags to return values. +- if info.type == 'gcc' and info.version >= '4.9.0': +- return '-fdiagnostics-color' +- elif info.type == 'clang': +- return '-fcolor-diagnostics' +- else: +- return '' ++ return '-fno-diagnostics-color' + + set_config('COLOR_CFLAGS', color_cflags) + +-- +2.24.1 + diff --git a/waterfox/waterfox-mozconfig b/waterfox/waterfox-mozconfig index 7fb292a..b28966d 100644 --- a/waterfox/waterfox-mozconfig +++ b/waterfox/waterfox-mozconfig @@ -2,8 +2,6 @@ ac_add_options --enable-default-toolkit=cairo-gtk3 -ac_add_options --prefix="$PREFIX" -ac_add_options --libdir="$LIBDIR" ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --disable-strip diff --git a/waterfox/waterfox-webrtc-gtest-libv4l2.patch b/waterfox/waterfox-webrtc-gtest-libv4l2.patch deleted file mode 100644 index fb09b9d..0000000 --- a/waterfox/waterfox-webrtc-gtest-libv4l2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/media/webrtc/trunk/gtest/moz.build.l4vl2 Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/media/webrtc/trunk/gtest/moz.build ---- Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/media/webrtc/trunk/gtest/moz.build.l4vl2 2018-12-17 10:39:21.000000000 -0200 -+++ Waterfox-ff4597172229f8d71940c3885b74b903b7b1821a/media/webrtc/trunk/gtest/moz.build 2019-01-08 17:34:47.260911090 -0200 -@@ -48,6 +48,8 @@ if CONFIG['MOZ_SYSTEM_JPEG']: - else: - USE_LIBS += ['media_libjpeg'] - -+OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_LIBVPX']: - OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS'] - else: diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 3f85188..a0467ef 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1,12 +1,12 @@ -%global commit 68014c079a1d4afa26aaad13466fcc76d0f6dcc4 +%global commit 8864e433baf07e995e7047e840d8f94d8f1b2496 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20191016 +%global date 20191205 %global with_snapshot 1 %global branch classic -%global freebsd_rev 480450 -%global freebsd_root %{name}-FreeBSD-patches-r%{freebsd_rev} +%global freebsd_rev 20191102 +%global freebsd_root %{name}-FreeBSD-patches-%{freebsd_rev} %if 0%{?with_snapshot} %global gver .%{date}git%{shortcommit} @@ -34,7 +34,6 @@ ExcludeArch: armv7hl %global system_libvpx 0 %endif %global system_webp 1 -%global system_vorbis 1 %global system_libicu 0 %global system_jpeg 1 @@ -42,16 +41,16 @@ ExcludeArch: armv7hl %global hardened_build 1 +%global disable_elfhack 0 + %global build_with_clang 0 %ifnarch %{ix86} ppc64 s390x %global build_with_pgo 1 %endif %ifarch x86_64 -%if !0%{?el7} %global build_with_lto 1 %endif -%endif # Big endian platforms %ifarch ppc64 s390x @@ -61,6 +60,7 @@ ExcludeArch: armv7hl %if 0%{?build_with_pgo} %global use_xvfb 1 %global build_tests 1 +%global disable_elfhack 1 %endif %if !0%{?run_tests} @@ -70,10 +70,9 @@ ExcludeArch: armv7hl %global debug_build 0 -%global disable_elfhack 0 - %global build_stylo 0 -%global build_rust_simd 1 +# stackrpms: disable simd because it only causes problems +%global build_rust_simd 0 # Set to build with pinned rust version # This enables stylo build when default rust version is not supported # and a downgraded rust package exists @@ -100,10 +99,6 @@ ExcludeArch: armv7hl %if 0%{?system_webp} %global webp_version 1.0.0 %endif -%if 0%{?system_vorbis} -%global ogg_version 1.3.3 -%global vorbis_version 1.3.5 -%endif %if 0%{?system_nss} %global nspr_version 4.17.0 @@ -120,6 +115,12 @@ ExcludeArch: armv7hl %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536) %endif +%if %{branch} == "classic" +%global channel Classic +%else +%global channel Current +%endif + %global mozappdir %{_libdir}/%{name} %global mozappdirdev %{_libdir}/%{name}-devel-%{version} %global langpackdir %{mozappdir}/langpacks @@ -152,13 +153,12 @@ BuildRequires: %{scl_buildreq} %endif %if 0%{?rhel} >= 7 %global system_webp 0 -%global system_vorbis 0 %endif Summary: Waterfox Web browser Name: waterfox -Version: 2019.10 -Release: 12.%{branch}%{?gver}%{?dist} +Version: 2019.12 +Release: 13.%{branch}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -172,6 +172,7 @@ Source0: %{vc_url}/archive/%{version}-%{branch}/%{name}-%{version}-%{bran # FreeBSD patches # https://www.freshports.org/www/waterfox # rev=revision ./waterfox-FreeBSD-patches-snapshot.sh +# https://github.com/MrAlex94/Waterfox/issues/1220 Source600: https://dl.bintray.com/phantomx/tarballs/%{freebsd_root}.tar.xz Source10: waterfox-mozconfig @@ -222,10 +223,6 @@ Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mo # Upstream updates/PRs/Reverts #Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch -## These seems to breaking LTO -Patch450: %{vc_url}/commit/8f87cbc0938fec17726dd09b4af2648c084fdbf7.patch#/%{name}-gh-8f87cbc.patch -Patch451: %{vc_url}/commit/8eacc27e9529f29dea26625ca2a28a9b9aff62c4.patch#/%{name}-gh-8eacc27.patch -Patch452: %{vc_url}/commit/94dc86561e44725210db9491ca7a06ed0322dff6.patch#/%{name}-gh-94dc865.patch # Debian patches Patch500: mozilla-440908.patch @@ -242,9 +239,8 @@ Patch700: %{name}-nolangpacks.patch # https://github.com/MrAlex94/Waterfox/pull/547.patch, down Patch701: %{name}-waterfoxdir-1.patch Patch702: %{name}-waterfoxdir-2.patch -Patch703: %{name}-webrtc-gtest-libv4l2.patch -Patch704: %{name}-fix-testing-file.patch - +Patch703: %{name}-fix-testing-file.patch +Patch704: %{name}-disable-diagnostics-color.patch %if 0%{?system_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} @@ -287,17 +283,12 @@ BuildRequires: pkgconfig(libnotify) >= %{libnotify_version} BuildRequires: pkgconfig(dri) BuildRequires: pkgconfig(libcurl) BuildRequires: dbus-glib-devel -BuildRequires: pkgconfig(libv4l2) %if 0%{?system_libvpx} BuildRequires: pkgconfig(vpx) >= %{libvpx_version} %endif %if 0%{?system_webp} BuildRequires: pkgconfig(libwebp) >= %{webp_version} %endif -%if 0%{?system_vorbis} -BuildRequires: pkgconfig(ogg) >= %{ogg_version} -BuildRequires: pkgconfig(vorbis) >= %{vorbis_version} -%endif BuildRequires: autoconf213 BuildRequires: pkgconfig(libpulse) %if 0%{?system_libicu} @@ -439,10 +430,6 @@ This package contains results of tests executed during build. %patch419 -p1 -b .mozilla-1320560 %patch420 -p1 -b .mozilla-1389436 -%patch450 -p1 -R -%patch451 -p1 -R -%patch452 -p1 -R - # Debian extension patch %patch500 -p1 -b .440908 @@ -490,8 +477,8 @@ done %patch700 -p1 -b .nolangpacks %patch701 -p1 -b .waterfoxdir-1 %patch702 -p1 -b .waterfoxdir-2 -%patch703 -p1 -b .lv4l2 -%patch704 -p1 -b .fix-testing-file +%patch703 -p1 -b .fix-testing-file +%patch704 -p1 -b .no-diagnostics-color # Patch for big endian platforms only %if 0%{?big_endian} @@ -499,9 +486,15 @@ done %patch36 -p2 -b .xlocale %endif +cp %{SOURCE26} . +sed -e 's|_BRANCH_|%{channel}|g' -i distribution.ini + rm -f .mozconfig cp %{SOURCE10} .mozconfig +echo "ac_add_options --prefix=\"%{_prefix}\"" >> .mozconfig +echo "ac_add_options --libdir=\"%{_libdir}\"" >> .mozconfig + %if 0%{?build_with_pgo} echo "mk_add_options MOZ_PGO=1" >> .mozconfig echo "mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 \$(MAKE) -C \$(MOZ_OBJDIR) pgo-profile-run'" >> .mozconfig @@ -616,14 +609,6 @@ echo "ac_add_options --with-system-webp" >> .mozconfig echo "ac_add_options --without-system-webp" >> .mozconfig %endif -%if 0%{?system_vorbis} -echo "ac_add_options --with-system-ogg" >> .mozconfig -echo "ac_add_options --with-system-vorbis" >> .mozconfig -%else -echo "ac_add_options --without-system-ogg" >> .mozconfig -echo "ac_add_options --without-system-vorbis" >> .mozconfig -%endif - %if 0%{?system_libicu} echo "ac_add_options --with-system-icu" >> .mozconfig %else @@ -732,7 +717,7 @@ MOZ_OPT_FLAGS="$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-O2/-O3/' -e 's/ -g\b/ -g1/') %if 0%{?build_with_clang} RPM_FLTO_FLAGS="-flto=thin -Wl,--thinlto-jobs=$RPM_NCPUS" %else -RPM_FLTO_FLAGS="-flto=$RPM_NCPUS -fuse-linker-plugin -flifetime-dse=1 -fdisable-ipa-cdtor" +RPM_FLTO_FLAGS="-flto=$RPM_NCPUS -fuse-linker-plugin -flifetime-dse=1" %endif MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS $RPM_FLTO_FLAGS" MOZ_LINK_FLAGS="$MOZ_OPT_FLAGS" @@ -757,6 +742,8 @@ MOZ_LINK_FLAGS="-Wl,--no-keep-memory" %endif %endif +# Source file to improve testing +cat > %{name}-env <<EOF %ifarch %{arm} %{ix86} export RUSTFLAGS="-Cdebuginfo=0" %endif @@ -776,21 +763,20 @@ export NM="gcc-nm" export RANLIB="gcc-ranlib" %endif -export CFLAGS=$MOZ_OPT_FLAGS -export CXXFLAGS=$MOZ_OPT_FLAGS -export LDFLAGS=$MOZ_LINK_FLAGS - -export PREFIX='%{_prefix}' -export LIBDIR='%{_libdir}' +export CFLAGS="$MOZ_OPT_FLAGS" +export CXXFLAGS="$MOZ_OPT_FLAGS" +export LDFLAGS="$MOZ_LINK_FLAGS" export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" export MOZ_SERVICES_SYNC="1" export MOZ_NOSPAM=1 export STRIP=%{_prefix}/bin/true -%if 0%{?build_with_lto} + +%if 0%{?build_with_lto} || 0%{?build_with_pgo} export TMPDIR="$(pwd)/tmpdir" -mkdir -p "$TMPDIR" +mkdir -p "\$TMPDIR" %endif +EOF %if "%{?scl_env}" != "" thispwd=$( pwd ) @@ -798,7 +784,11 @@ mkdir -p "$TMPDIR" pushd $thispwd %endif +source ./%{name}-env + %if 0%{?build_with_pgo} +mkdir -p objdir/dist/%{name}-%{branch} +ln -sf %{name}-%{branch} objdir/dist/%{name} SHELL=%{_prefix}/bin/bash GDK_BACKEND=x11 xvfb-run ./mach build %{?verbose_mach} %else SHELL=%{_prefix}/bin/bash ./mach build %{?verbose_mach} @@ -865,12 +855,12 @@ mkdir -p %{buildroot}{%{_libdir},%{_bindir},%{_datadir}/applications} desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE20} # set up the waterfox start script -rm -rf %{buildroot}%{_bindir}/waterfox +rm -rf %{buildroot}%{_bindir}/%{name} sed -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE21} \ - > %{buildroot}%{_bindir}/waterfox -chmod 755 %{buildroot}%{_bindir}/waterfox + > %{buildroot}%{_bindir}/%{name} +chmod 755 %{buildroot}%{_bindir}/%{name} -install -p -D -m 644 %{SOURCE23} %{buildroot}%{_mandir}/man1/waterfox.1 +install -p -D -m 644 %{SOURCE23} %{buildroot}%{_mandir}/man1/%{name}.1 rm -f %{buildroot}/%{mozappdir}/waterfox-config rm -f %{buildroot}/%{mozappdir}/update-settings.ini @@ -878,7 +868,7 @@ rm -f %{buildroot}/%{mozappdir}/update-settings.ini for s in 16 22 24 32 48 64 128 256; do mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps cp -p browser/branding/unofficial/default${s}.png \ - %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/waterfox.png + %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png done # Register as an application to be visible in the software center @@ -988,7 +978,7 @@ cp %{SOURCE12} %{buildroot}%{mozappdir}/browser/defaults/preferences # Add distribution.ini mkdir -p %{buildroot}%{mozappdir}/distribution -cp %{SOURCE26} %{buildroot}%{mozappdir}/distribution +cp distribution.ini %{buildroot}%{mozappdir}/distribution # Remove copied libraries to speed up build rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libmozjs.so @@ -1029,14 +1019,14 @@ if [ $1 -eq 0 ]; then fi %files -f %{name}.lang -%{_bindir}/waterfox -%{mozappdir}/waterfox -%{mozappdir}/waterfox-bin +%{_bindir}/%{name} +%{mozappdir}/%{name} +%{mozappdir}/%{name}-bin %doc %{_mandir}/man1/* %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/* -%dir %{_datadir}/waterfox/extensions/* -%dir %{_libdir}/waterfox/extensions/* +%dir %{_datadir}/%{name}/extensions/* +%dir %{_libdir}/%{name}/extensions/* %{_metainfodir}/*.appdata.xml %{_datadir}/applications/*.desktop %dir %{mozappdir} @@ -1049,6 +1039,7 @@ fi # That's Windows only %ghost %{mozappdir}/browser/features/aushelper@mozilla.org.xpi %attr(644, root, root) %{mozappdir}/browser/blocklist.xml +%attr(644, root, root) %{mozappdir}/browser/ua-update.json %dir %{mozappdir}/browser/extensions %{mozappdir}/browser/extensions/* %if %{build_langpacks} @@ -1059,7 +1050,7 @@ fi %{mozappdir}/run-mozilla.sh %{mozappdir}/application.ini %exclude %{mozappdir}/removed-files -%{_datadir}/icons/hicolor/*/apps/waterfox.png +%{_datadir}/icons/hicolor/*/apps/%{name}.png %{mozappdir}/*.so %{mozappdir}/gtk2/*.so %{mozappdir}/defaults/pref/channel-prefs.js @@ -1083,9 +1074,28 @@ fi #--------------------------------------------------------------------- %changelog -* Thu Oct 17 2019 B Stack <bgstack15@gmail.com> - 2019.10-12.classic.20191016git68014c0 +* Thu Dec 19 2019 B Stack <bgstack15@gmail.com> - 2019.12-13.classic - add el7 and el8 support - repackage for stackrpms +- disable simd globally + +* Thu Dec 12 2019 Phantom X <megaphantomx at bol dot com dot br> - 2019.12-3.classic +- PGO build from COPR crashing, try to fix disabling elfhack + +* Wed Dec 11 2019 Phantom X <megaphantomx at bol dot com dot br> - 2019.12-2.classic +- PGO again + +* Wed Dec 11 2019 Phantom X <megaphantomx at bol dot com dot br> - 2019.12-1.classic +- 2019.12 +- Disable broken PGO for the time +- Update FreeBSD patches. No system ogg/vorbis anymore + +* Thu Oct 24 2019 Phantom X <megaphantomx at bol dot com dot br> - 2019.10-4.classic.20191020gitf80144e +- New snapshot +- Add channel to distribution.ini + +* Thu Oct 17 2019 Phantom X <megaphantomx at bol dot com dot br> - 2019.10-3.classic.20191016git68014c0 +- PR to restore user-agent overrides * Wed Oct 16 2019 Phantom X <megaphantomx at bol dot com dot br> - 2019.10-2.classic.20191016git68014c0 - Try to fix crash with LTO, reverting some commits |