From 880c0e006baa0b8c9f8be9b62361166b5b95c76b Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Sat, 13 Apr 2019 16:56:12 +0200
Subject: libre/iceweasel: updated to 66.0.3

---
 libre/iceweasel/PKGBUILD                  | 25 +++++++++----------
 libre/iceweasel/iceweasel.desktop         | 41 ++++++++++++++++++++++++++-----
 libre/iceweasel/libre-searchengines.patch |  5 +---
 3 files changed, 48 insertions(+), 23 deletions(-)

(limited to 'libre')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index b0cd80005..e1531c876 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -39,7 +39,7 @@
 pkgname=iceweasel
 replaces=('firefox')
 epoch=1
-pkgver=66.0.2
+pkgver=66.0.3
 pkgrel=1
 pkgrel+=.parabola1
 _brandingver=66.0
@@ -69,13 +69,13 @@ source=("https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox
         libre.patch
         arm.patch
         build-arm-libopus.patch)
-sha256sums=('fc37538e5852d4c97778ad7437fb1d37e9218c284ced70935378562e35184b46'
+sha256sums=('1fe4cfe4f4afce8d5532da8f36a48c333750c90a6ee67167309357edf514c22a'
             'SKIP'
             '821f858bac2e13ce02b8c20d5387d4ecc8ab2d0e4ebe0a517cbf935da6aeb31b'
-            'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa'
+            'e439117380218898cd5c60a8da8947847efbd0fe64cc06b129d6ca20a392cb3d'
             'ffac6b832ba2f80ac0682aa5ee88006b7033543b8be89fc17deec30b1b2c4d12'
             'SKIP'
-            '24ff5e736723350224115c3420285d3552d1fcd91fc8adff662c35d422f23883'
+            '52213bdc0078b83dcaf34d04316309504acefe8bfc9b4c0a1f69e0b1f5458e4d'
             'a315507efe495ba55ab4ae52b1e2b3a0c1e7ac54b7ed976899da1dcd03532f95'
             '2c9e39b9b62d5a75e31908cb4d42ff8006ff9406aed2f7deff826fe1466cd31a'
             '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
@@ -135,24 +135,19 @@ END
 
   if [[ $CARCH = arm* ]]; then
     sed -i '/--enable-hardening/d' .mozconfig
-    sed -i '/--enable-lto/d' .mozconfig
     sed -i '/--enable-rust-simd/d' .mozconfig
+    sed -i '/--enable-lto/d' .mozconfig
     sed -i '/export MOZ_PGO/d' .mozconfig
 
     patch -Np1 -i ../arm.patch
     patch -Np1 -i ../build-arm-libopus.patch
 
     cat >> .mozconfig <<END
+ac_add_options --disable-webrtc
 ac_add_options --enable-optimize="-O2"
 ac_add_options --disable-elf-hack
-ac_add_options --disable-webrtc
 ac_add_options --disable-av1
-ac_add_options --disable-lto
-export CC=gcc
-export CXX=g++
-export AR=gcc-ar
-export NM=gcc-nm
-export RANLIB=gcc-ranlib
+mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS"
 END
   fi
 
@@ -237,7 +232,11 @@ build() {
   # LTO needs more open files
   ulimit -n 4096
 
-  xvfb-run -a -n 97 -s "-screen 0 1600x1200x24" ./mach build
+  if [[ $CARCH == x86_64 ]]; then
+    xvfb-run -a -n 97 -s "-screen 0 1600x1200x24" ./mach build
+  else
+    ./mach build
+  fi
   ./mach buildsymbols
 }
 
diff --git a/libre/iceweasel/iceweasel.desktop b/libre/iceweasel/iceweasel.desktop
index ab230ba5a..8d69f828c 100644
--- a/libre/iceweasel/iceweasel.desktop
+++ b/libre/iceweasel/iceweasel.desktop
@@ -2,7 +2,7 @@
 Version=1.0
 Name=Iceweasel
 GenericName=Web Browser
-GenericName[ar]=متصفح وِب
+GenericName[ar]=متصفح ويب
 GenericName[ast]=Restolador Web
 GenericName[bn]=ওয়েব ব্রাউজার
 GenericName[ca]=Navegador web
@@ -19,7 +19,7 @@ GenericName[gl]=Navegador Web
 GenericName[he]=דפדפן אינטרנט
 GenericName[hr]=Web preglednik
 GenericName[hu]=Webböngésző
-GenericName[it]=Browser Web
+GenericName[it]=Browser web
 GenericName[ja]=ウェブ・ブラウザ
 GenericName[ko]=웹 브라우저
 GenericName[ku]=Geroka torê
@@ -42,8 +42,8 @@ GenericName[uk]=Веб-браузер
 GenericName[vi]=Trình duyệt Web
 GenericName[zh_CN]=网络浏览器
 GenericName[zh_TW]=網路瀏覽器
-Comment=Browse the Web
-Comment[ar]=تصفح الوِب
+Comment=Browse the World Wide Web
+Comment[ar]=تصفح الشبكة العنكبوتية العالمية
 Comment[ast]=Restola pela Rede
 Comment[bn]=ইন্টারনেট ব্রাউজ করুন
 Comment[ca]=Navegueu per el web
@@ -83,15 +83,44 @@ Comment[uk]=Перегляд сторінок Інтернету
 Comment[vi]=Để duyệt các trang web
 Comment[zh_CN]=浏览互联网
 Comment[zh_TW]=瀏覽網際網路
+Keywords=Internet;WWW;Browser;Web;Explorer
+Keywords[ar]=انترنت;إنترنت;متصفح;ويب;وب
+Keywords[ast]=Internet;WWW;Restolador;Web;Esplorador
+Keywords[ca]=Internet;WWW;Navegador;Web;Explorador;Explorer
+Keywords[cs]=Internet;WWW;Prohlížeč;Web;Explorer
+Keywords[da]=Internet;Internettet;WWW;Browser;Browse;Web;Surf;Nettet
+Keywords[de]=Internet;WWW;Browser;Web;Explorer;Webseite;Site;surfen;online;browsen
+Keywords[el]=Internet;WWW;Browser;Web;Explorer;Διαδίκτυο;Περιηγητής;Firefox;Φιρεφοχ;Ιντερνετ
+Keywords[es]=Explorador;Internet;WWW
+Keywords[fi]=Internet;WWW;Browser;Web;Explorer;selain;Internet-selain;internetselain;verkkoselain;netti;surffaa
+Keywords[fr]=Internet;WWW;Browser;Web;Explorer;Fureteur;Surfer;Navigateur
+Keywords[he]=דפדפן;אינטרנט;רשת;אתרים;אתר;פיירפוקס;מוזילה;
+Keywords[hr]=Internet;WWW;preglednik;Web
+Keywords[hu]=Internet;WWW;Böngésző;Web;Háló;Net;Explorer
+Keywords[it]=Internet;WWW;Browser;Web;Navigatore
+Keywords[is]=Internet;WWW;Vafri;Vefur;Netvafri;Flakk
+Keywords[ja]=Internet;WWW;Web;インターネット;ブラウザ;ウェブ;エクスプローラ
+Keywords[nb]=Internett;WWW;Nettleser;Explorer;Web;Browser;Nettside
+Keywords[nl]=Internet;WWW;Browser;Web;Explorer;Verkenner;Website;Surfen;Online
+Keywords[pt]=Internet;WWW;Browser;Web;Explorador;Navegador
+Keywords[pt_BR]=Internet;WWW;Browser;Web;Explorador;Navegador
+Keywords[ru]=Internet;WWW;Browser;Web;Explorer;интернет;браузер;веб;файрфокс;огнелис
+Keywords[sk]=Internet;WWW;Prehliadač;Web;Explorer
+Keywords[sl]=Internet;WWW;Browser;Web;Explorer;Brskalnik;Splet
+Keywords[tr]=İnternet;WWW;Tarayıcı;Web;Gezgin;Web sitesi;Site;sörf;çevrimiçi;tara
+Keywords[uk]=Internet;WWW;Browser;Web;Explorer;Інтернет;мережа;переглядач;оглядач;браузер;веб;файрфокс;вогнелис;перегляд
+Keywords[vi]=Internet;WWW;Browser;Web;Explorer;Trình duyệt;Trang web
+Keywords[zh_CN]=Internet;WWW;Browser;Web;Explorer;网页;浏览;上网;火狐;Firefox;ff;互联网;网站;
+Keywords[zh_TW]=Internet;WWW;Browser;Web;Explorer;網際網路;網路;瀏覽器;上網;網頁;火狐
 Exec=/usr/lib/iceweasel/iceweasel %u
 Icon=iceweasel
 Terminal=false
+X-MultipleArgs=false
 Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;
 StartupNotify=true
 StartupWMClass=Iceweasel
 Categories=Network;WebBrowser;
-Keywords=web;browser;internet;
 Actions=new-window;new-private-window;
 
 [Desktop Action new-window]
diff --git a/libre/iceweasel/libre-searchengines.patch b/libre/iceweasel/libre-searchengines.patch
index a48f7acac..fdbde36e9 100644
--- a/libre/iceweasel/libre-searchengines.patch
+++ b/libre/iceweasel/libre-searchengines.patch
@@ -2,7 +2,7 @@ diff --git a/browser/components/search/searchplugins/list.json b/browser/compone
 index 544740a43..4961e5437 100644
 --- a/browser/components/search/searchplugins/list.json
 +++ b/browser/components/search/searchplugins/list.json
-@@ -1,879 +1,774 @@
+@@ -1,879 +1,771 @@
  {
    "default": {
 -    "searchDefault": "Google",
@@ -213,7 +213,6 @@ index 544740a43..4961e5437 100644
      "cs": {
        "default": {
 -        "searchOrder": ["Google", "Seznam"],
-+        "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          "visibleDefaultEngines": [
 -          "google-b-d", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
@@ -518,7 +517,6 @@ index 544740a43..4961e5437 100644
      "ja-JP-macos": {
        "default": {
 -        "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"],
-+        "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          "visibleDefaultEngines": [
 -          "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
@@ -528,7 +526,6 @@ index 544740a43..4961e5437 100644
      "ja": {
        "default": {
 -        "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"],
-+        "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          "visibleDefaultEngines": [
 -          "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-- 
cgit v1.2.2