From d5e6eade753acb1a66420ece1e6c7309a9b1515a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 14:35:32 -0400 Subject: libre/iceweasel: Adopt as co-maintainer --- libre/iceweasel/PKGBUILD | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 99e91acda..8ffb5f127 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -1,11 +1,13 @@ -# Maintainer (Arch): Jan Alexander Steffens (heftig) -# Contributor (Arch): Ionut Biru -# Contributor (Arch): Jakub Schmidtke +# Maintainer (Arch:firefox): Jan Alexander Steffens (heftig) +# Contributor (Arch:firefox): Ionut Biru +# Contributor (Arch:firefox): Jakub Schmidtke + +# Contributor (ConnochaetOS): Henry Jensen + # Maintainer: Andreas Grapentin +# Maintainer: Luke Shumaker # Contributor: André Silva # Contributor: Márcio Silva -# Contributor (ConnochaetOS): Henry Jensen -# Contributor: Luke Shumaker # Contributor: fauno # Contributor: vando # Contributor: Figue -- cgit v1.2.3 From 50139b268315cf2746be032203055a37f7e89385 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 14:39:41 -0400 Subject: libre/iceweasel: Rename _bver→_brandingver; _brel→_brandingrel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libre/iceweasel/PKGBUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 8ffb5f127..61f9c9b48 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -31,8 +31,8 @@ pkgname=iceweasel epoch=1 pkgver=61.0.2 pkgrel=0.testing1 -_bver=61.0 -_brel=1 +_brandingver=${pkgver%.*} +_brandingrel=1 pkgdesc="Libre standalone web browser based on Mozilla Firefox" arch=(x86_64) arch+=(i686 armv7h) @@ -54,7 +54,7 @@ conflicts=("$_pkgname") # https://archive.mozilla.org/pub/firefox/releases/$pkgver/SOURCE source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz $pkgname.desktop) -source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig} +source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig} libre.patch) sha256sums=('0bdecbbb2a955c9f4c5cd0b33acd1e47afcb6cd57ac89cf11257668e3cef202c' 'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa' @@ -127,7 +127,7 @@ END fi # perform rebranding - local brandingdir="$srcdir/$pkgname-$_bver" + local brandingdir="$srcdir/$pkgname-$_brandingver" mkdir -v browser/branding/$pkgname cp -va $brandingdir/branding/* browser/branding/$pkgname @@ -144,7 +144,7 @@ END # produce icons for i in 128; do - rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \ + rsvg-convert -w $i -h $i "$brandingdir/branding/${pkgname}_icon.svg" \ -o "browser/branding/iceweasel/default$i.png" done @@ -527,13 +527,13 @@ app.partner.parabola=parabola END for i in 16 22 24 32 48 64 128 192 256 384; do - rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \ + rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_brandingver/branding/${pkgname}_icon.svg" \ -o "browser/branding/iceweasel/default$i.png" install -Dm644 "browser/branding/iceweasel/default$i.png" \ "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" done - install -Dm644 "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \ + install -Dm644 "$srcdir/$pkgname-$_brandingver/branding/${pkgname}_icon.svg" \ "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg" install -Dm644 ../$pkgname.desktop \ -- cgit v1.2.3 From 56dc0faf282f93024b8c68a36cc13e5772e94b9c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 14:48:56 -0400 Subject: libre/iceweasel: From ff 57.0-1: Don't disable stylo Stylo is the new Rust CSS engine. --- libre/iceweasel/PKGBUILD | 2 -- 1 file changed, 2 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 61f9c9b48..82205ed80 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -106,7 +106,6 @@ ac_add_options --enable-jack ac_add_options --enable-startup-notification ac_add_options --disable-crashreporter ac_add_options --disable-updater -ac_add_options --disable-stylo ac_add_options --disable-eme END @@ -121,7 +120,6 @@ END mk_add_options MOZ_MAKE_FLAGS="-j1" ac_add_options --disable-webrtc ac_add_options --disable-elf-hack -ac_add_options --disable-stylo ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns" END fi -- cgit v1.2.3 From 6fd783fe66ce027f8773931b7472e52de6d8667c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 15:37:37 -0400 Subject: libre/iceweasel: From ff 61.0-1: Drop no-crmf.diff --- libre/iceweasel/PKGBUILD | 3 --- libre/iceweasel/no-crmf.diff | 15 --------------- 2 files changed, 18 deletions(-) delete mode 100644 libre/iceweasel/no-crmf.diff (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 82205ed80..d3b3b9a20 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -69,9 +69,6 @@ prepare() { cd firefox-$pkgver - # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 - patch -Np1 -i ../no-crmf.diff - cat >.mozconfig < Date: Thu, 23 Aug 2018 15:16:13 -0400 Subject: libre/iceweasel: From ff 61.0-1: Hunspell changes We now set the hunspell location by setting pref("spellchecker.dictionary_path", "/usr/share/hunspell"); --- libre/iceweasel/PKGBUILD | 6 ------ 1 file changed, 6 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index d3b3b9a20..2a02d557b 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -93,7 +93,6 @@ ac_add_options --with-system-jpeg ac_add_options --with-system-libvpx ac_add_options --with-system-nspr ac_add_options --with-system-nss -ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi @@ -534,11 +533,6 @@ END install -Dm644 ../$pkgname.desktop \ "$pkgdir/usr/share/applications/$pkgname.desktop" - # Use system-provided dictionaries - rm -r "$pkgdir/usr/lib/$pkgname/dictionaries" - ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries" - ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation" - # Install a wrapper to avoid confusion about binary path install -Dm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" < Date: Thu, 23 Aug 2018 15:55:25 -0400 Subject: libre/iceweasel: From ff 61.0-1: Drop e10s opt-in --- libre/iceweasel/PKGBUILD | 3 --- 1 file changed, 3 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 2a02d557b..3df3438dd 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -206,9 +206,6 @@ pref("browser.shell.checkDefaultBrowser", false); pref("extensions.autoDisableScopes", 11); pref("extensions.shownSelectionUI", true); -// Opt all of us into e10s, instead of just 50% -pref("browser.tabs.remote.autostart", true); - // Disable "alt" as a shortcut key to open full menu bar. Conflicts with "alt" as a modifier pref("ui.key.menuAccessKeyFocuses", false); -- cgit v1.2.3 From da5d76e73fa4e901094c3bb1c0c3fcadb5f7df38 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 14:41:03 -0400 Subject: libre/iceweasel: From ff 61.0.1-1: Drop some hacks from older versions --- libre/iceweasel/PKGBUILD | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 3df3438dd..04b685208 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -64,9 +64,6 @@ sha256sums=('0bdecbbb2a955c9f4c5cd0b33acd1e47afcb6cd57ac89cf11257668e3cef202c' validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin prepare() { - mkdir path - ln -s /usr/bin/python2 path/python - cd firefox-$pkgver cat >.mozconfig < Date: Thu, 23 Aug 2018 14:45:43 -0400 Subject: libre/iceweasel: Clean up hilariously over-quoted sed expressions Also, we run package() with errtrap; no need to `|| die` after things. --- libre/iceweasel/PKGBUILD | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 04b685208..a083bff6b 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -141,14 +141,14 @@ END # Patch and remove anything that's left patch -Np1 -i "$srcdir/libre.patch" - sed -i 's|Adobe Flash|SWF Player|g; - ' browser/base/content/pageinfo/permissions.js \ - browser/base/content/browser-plugins.js - sed -i '\|["]displayName["][:] ["]Flash["]| s|Flash|SWF Player| - \|["]displayName["][:] ["]Shockwave["]| s|Shockwave|DCR Player| - \|["]displayName["][:] ["]QuickTime["]| s|QuickTime|MOV Player| - \|installLinux| s|true|false| - ' browser/base/content/browser-plugins.js + sed -i 's/Adobe Flash/SWF Player/g' -- \ + browser/base/content/pageinfo/permissions.js \ + browser/base/content/browser-plugins.js + sed -e '/"displayName": "Flash"/ s/Flash/SWF Player/' \ + -e '/"displayName": "Shockwave"/ s/Shockwave/DCR Player/' \ + -e '/"displayName": "QuickTime"/ s/QuickTime/MOV Player/' \ + -e '/installLinux/ s/true/false/' \ + -i -- browser/base/content/browser-plugins.js # re-use 'abouthome' page for 'newtab' page install -d browser/base/content/newtab @@ -159,10 +159,10 @@ END cp -av /usr/lib/mozilla/searchplugins browser/locales # Disable various components at the source level - sed -i 's|[;]1|;0|' toolkit/components/telemetry/TelemetryStartup.manifest || die "failed break telemetry startup" - #sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService" - sed -i '/pocket/d' browser/extensions/moz.build || die "failed to wipe pocket" - sed -i '/activity-stream/d' browser/extensions/moz.build || die "failed to wipe activity-stream" + sed -i 's/;1/;0/' toolkit/components/telemetry/TelemetryStartup.manifest + #sed -i 's/;1/;0/' browser/experiments/Experiments.manifest + sed -i '/pocket/d' browser/extensions/moz.build + sed -i '/activity-stream/d' browser/extensions/moz.build } build() { -- cgit v1.2.3 From 37021d4a81bdd37541a1cc2606aa8a5f3e0114ca Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 14:49:50 -0400 Subject: libre/iceweasel: Clean up the ARM-specific hacks 1. The sed expression to disable GOLD (x86-only) was broken, fix it 2. We shouldn't disable PIE 3. Why disable optimizing (what your ARM device isn't slow enough?) 4. Don't disable WebRTC on ARM only 5. Don't disable the ELF hack --- libre/iceweasel/PKGBUILD | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index a083bff6b..a379819d8 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -102,20 +102,12 @@ ac_add_options --disable-updater ac_add_options --disable-eme END - if [[ "$CARCH" == arm* ]]; then - sed -i \ - -e '/enable-gold/s/^/#/' \ - -e '/enable-pie/s/^/#/' \ - -e '/enable-optimize/d' \ - .mozconfig - - cat >> .mozconfig << END -mk_add_options MOZ_MAKE_FLAGS="-j1" -ac_add_options --disable-webrtc -ac_add_options --disable-elf-hack -ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns" -END - fi + if [[ $CARCH = arm* ]]; then + sed -i '/--enable-linker=gold/d' .mozconfig + cat >> .mozconfig <<- END + ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns" + END + fi # end [[ $CARCH = arm* ]] # perform rebranding local brandingdir="$srcdir/$pkgname-$_brandingver" -- cgit v1.2.3 From d4d8c2dac57f6a530dfb9b083e77ff27f264eb6a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 14:52:28 -0400 Subject: libre/iceweasel: Make `makepkg -o` idempotent --- libre/iceweasel/PKGBUILD | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index a379819d8..9ad813a61 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -51,12 +51,12 @@ optdepends=('networkmanager: Location detection via available WiFi networks' options=(!emptydirs !makeflags !strip) replaces=("$_pkgname") conflicts=("$_pkgname") -# https://archive.mozilla.org/pub/firefox/releases/$pkgver/SOURCE -source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz +_repo=https://hg.mozilla.org/mozilla-unified +source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" $pkgname.desktop) source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig} libre.patch) -sha256sums=('0bdecbbb2a955c9f4c5cd0b33acd1e47afcb6cd57ac89cf11257668e3cef202c' +sha256sums=('SKIP' 'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa' 'dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e' 'SKIP' @@ -64,7 +64,7 @@ sha256sums=('0bdecbbb2a955c9f4c5cd0b33acd1e47afcb6cd57ac89cf11257668e3cef202c' validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin prepare() { - cd firefox-$pkgver + cd mozilla-unified cat >.mozconfig < browser/base/content/newtab/newTab.xhtml # Load our searchplugins - rm -rv browser/locales/searchplugins - cp -av /usr/lib/mozilla/searchplugins browser/locales + rm -rf -- browser/locales/searchplugins + cp -aT -- /usr/lib/mozilla/searchplugins browser/locales/searchplugins # Disable various components at the source level sed -i 's/;1/;0/' toolkit/components/telemetry/TelemetryStartup.manifest @@ -158,7 +159,7 @@ END } build() { - cd firefox-$pkgver + cd mozilla-unified export MOZ_SOURCE_REPO="$_repo" @@ -167,7 +168,7 @@ build() { } package() { - cd firefox-$pkgver + cd mozilla-unified DESTDIR="$pkgdir" ./mach install find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} + -- cgit v1.2.3 From f183568c8fcda088c9f467fec6c8c098e42f7c00 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 14:53:24 -0400 Subject: libre/iceweasel: Be careful with potentially ambiguous args to install(1) --- libre/iceweasel/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 9ad813a61..64b7e7914 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -121,10 +121,10 @@ END quilt push -av # Put "Start Page" branding images in the source code - install -m644 "$brandingdir/branding/"{drm-free,gnu_headshadow,parabola-banner}.png \ - browser/base/content/abouthome - install -m644 "$brandingdir/branding/watermark.svg" \ - browser/extensions/onboarding/content/img + install -m644 -t browser/base/content/abouthome -- \ + "$brandingdir/branding"/{drm-free,gnu_headshadow,parabola-banner}.png + install -m644 -t browser/extensions/onboarding/content/img -- \ + "$brandingdir/branding/watermark.svg" # produce icons for i in 128; do -- cgit v1.2.3 From 6ef30fbab26a15256330d781b9bd53b64e97ec88 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 14:54:43 -0400 Subject: libre/iceweasel: Tidy formatting a touch --- libre/iceweasel/PKGBUILD | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 64b7e7914..6c411c721 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -109,29 +109,27 @@ END END fi # end [[ $CARCH = arm* ]] - # perform rebranding + ## Rebranding local brandingdir="$srcdir/$pkgname-$_brandingver" + # file dump rm -rf -- browser/branding/$pkgname cp -aT -- $brandingdir/branding browser/branding/$pkgname - + # patching rm -rf .pc export QUILT_PATCHES=$brandingdir/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' quilt push -av - # Put "Start Page" branding images in the source code install -m644 -t browser/base/content/abouthome -- \ "$brandingdir/branding"/{drm-free,gnu_headshadow,parabola-banner}.png install -m644 -t browser/extensions/onboarding/content/img -- \ "$brandingdir/branding/watermark.svg" - # produce icons for i in 128; do rsvg-convert -w $i -h $i "$brandingdir/branding/${pkgname}_icon.svg" \ -o "browser/branding/iceweasel/default$i.png" done - # Patch and remove anything that's left patch -Np1 -i "$srcdir/libre.patch" sed -i 's/Adobe Flash/SWF Player/g' -- \ @@ -142,15 +140,12 @@ END -e '/"displayName": "QuickTime"/ s/QuickTime/MOV Player/' \ -e '/installLinux/ s/true/false/' \ -i -- browser/base/content/browser-plugins.js - # re-use 'abouthome' page for 'newtab' page install -d browser/base/content/newtab cat browser/base/content/abouthome/aboutHome.xhtml > browser/base/content/newtab/newTab.xhtml - # Load our searchplugins rm -rf -- browser/locales/searchplugins cp -aT -- /usr/lib/mozilla/searchplugins browser/locales/searchplugins - # Disable various components at the source level sed -i 's/;1/;0/' toolkit/components/telemetry/TelemetryStartup.manifest #sed -i 's/;1/;0/' browser/experiments/Experiments.manifest @@ -172,7 +167,7 @@ package() { DESTDIR="$pkgdir" ./mach install find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} + - local _shortver=$(echo $pkgver | cut -d'.' -f1,2) + local _shortver=$(cut -d. -f1,2 <<<"$pkver") _vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" install -Dm644 /dev/stdin "$_vendorjs" < Date: Thu, 23 Aug 2018 14:55:18 -0400 Subject: libre/iceweasel: Fix error in firefox-branding.js I don't know why we wanted to disable browser.startup.homepage_override.mstone anyway, I disagree with that call. --- libre/iceweasel/PKGBUILD | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 6c411c721..474e17ba2 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -111,6 +111,8 @@ END ## Rebranding local brandingdir="$srcdir/$pkgname-$_brandingver" + sed -i '/lockPref("browser.startup.homepage_override.mstone"/d' \ + "$brandingdir/branding/firefox-branding.js" # file dump rm -rf -- browser/branding/$pkgname cp -aT -- $brandingdir/branding browser/branding/$pkgname -- cgit v1.2.3 From 138dc8acb260af9b52acc81e170e7d38c5c382c3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 15:16:51 -0400 Subject: libre/iceweasel: Bump pkgrel --- libre/iceweasel/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 474e17ba2..f4535b593 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -30,9 +30,9 @@ _pkgname=firefox pkgname=iceweasel epoch=1 pkgver=61.0.2 -pkgrel=0.testing1 _brandingver=${pkgver%.*} _brandingrel=1 +pkgrel=1.parabola1 pkgdesc="Libre standalone web browser based on Mozilla Firefox" arch=(x86_64) arch+=(i686 armv7h) -- cgit v1.2.3 From 2fff297942fd9108971f7f3e25be1eee69ecbcd6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 15:22:53 -0400 Subject: libre/iceweasel: Drop conflicts=(firefox) Let your-freedom do that. --- libre/iceweasel/PKGBUILD | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index f4535b593..d669208ff 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -26,7 +26,6 @@ # - added makedepends: mozilla-searchplugins, quilt, libxslt, imagemagick # - added replaces, conflicts: firefox -_pkgname=firefox pkgname=iceweasel epoch=1 pkgver=61.0.2 @@ -49,8 +48,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'pulseaudio: Audio support' 'speech-dispatcher: Text-to-Speech') options=(!emptydirs !makeflags !strip) -replaces=("$_pkgname") -conflicts=("$_pkgname") +replaces=('firefox') _repo=https://hg.mozilla.org/mozilla-unified source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" $pkgname.desktop) -- cgit v1.2.3 From 65f7c9dc7566347f98bcf1b49d06d796bf9c1d47 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 15:49:19 -0400 Subject: libre/iceweasel: Update rationale comment --- libre/iceweasel/PKGBUILD | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index d669208ff..2e4c28c39 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -19,12 +19,23 @@ # Contributor: evr # Contributor: Muhammad 'MJ' Jassim -# parabola changes and rationale: -# - rebranded to iceweasel -# - removed google api keys and usage -# - removed use of firefox-symbolic.svg -# - added makedepends: mozilla-searchplugins, quilt, libxslt, imagemagick -# - added replaces, conflicts: firefox +# Rational for inclusion in [libre]: +# - For FSDG compliance, we must modify the addons pages to use GNU +# IceCat plugins sources, rather than addons.mozilla.org, which +# hosts non-free addons. +# - Disable EME (implemented via the libWideVine CDM) +# +# The above changes cause us to run afoul of the Firefox trademark +# policy[1], so making those changes also requires us to: +# - Rebrand to Iceweasel +# +# While we're at it, while not strictly nescessary for FSDG +# compliance: +# - Remove google api keys and usage +# - Disable Mozilla telemetry and crash reporting (good manners +# because of all of the other patching we're doing +# +# [1]: https://www.mozilla.org/en-US/foundation/trademarks/policy/ pkgname=iceweasel epoch=1 -- cgit v1.2.3 From a1ede4bc976b652af13a38fb3972d257828c5293 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 15:54:37 -0400 Subject: libre/iceweasel: Pull the branding bits in to their own header section --- libre/iceweasel/PKGBUILD | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 2e4c28c39..35c9171f1 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -38,11 +38,11 @@ # [1]: https://www.mozilla.org/en-US/foundation/trademarks/policy/ pkgname=iceweasel +replaces=('firefox') epoch=1 pkgver=61.0.2 -_brandingver=${pkgver%.*} -_brandingrel=1 -pkgrel=1.parabola1 +pkgrel=1 +pkgrel+=.parabola1 pkgdesc="Libre standalone web browser based on Mozilla Firefox" arch=(x86_64) arch+=(i686 armv7h) @@ -53,24 +53,27 @@ depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib ffm depends+=('icu>=62' 'icu<63') makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb autoconf2.13 rust mercurial clang llvm jack gtk2 python) -makedepends+=(mozilla-searchplugins quilt libxslt imagemagick) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' 'speech-dispatcher: Text-to-Speech') options=(!emptydirs !makeflags !strip) -replaces=('firefox') _repo=https://hg.mozilla.org/mozilla-unified source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" $pkgname.desktop) +sha256sums=('SKIP' + 'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa') + +# Branding +_brandingver=$(cut -d. -f1,2<<<"$pkgver") +_brandingrel=1 +makedepends+=(mozilla-searchplugins quilt libxslt imagemagick) source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig} libre.patch) -sha256sums=('SKIP' - 'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa' - 'dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e' - 'SKIP' - 'f2f3484a5339c7208a2a44b63a185ec5a57f837040627d29cc45b4d1d14ef6c2') -validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin +sha256sums+=('dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e' + 'SKIP' + 'f2f3484a5339c7208a2a44b63a185ec5a57f837040627d29cc45b4d1d14ef6c2') +validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin prepare() { cd mozilla-unified -- cgit v1.2.3 From 689e997085c3b24cd438933cd928b5b1f898f875 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 16:01:27 -0400 Subject: libre/iceweasel: For merging changes, clearly separate our vendor.js from Arch's --- libre/iceweasel/PKGBUILD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 35c9171f1..18a9bc72c 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -181,7 +181,6 @@ package() { DESTDIR="$pkgdir" ./mach install find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} + - local _shortver=$(cut -d. -f1,2 <<<"$pkver") _vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" install -Dm644 /dev/stdin "$_vendorjs" <> "$_vendorjs" < Date: Thu, 23 Aug 2018 16:10:53 -0400 Subject: libre/iceweasel: distribution.ini: Identify Iceweasel as *Parabola* Iceweasel --- libre/iceweasel/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 18a9bc72c..48e153d9a 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -503,7 +503,7 @@ END [Global] id=parabola version=1.0 -about=Iceweasel for Parabola GNU/Linux-libre +about=Parabola Iceweasel for Parabola GNU/Linux-libre [Preferences] app.distributor=parabola -- cgit v1.2.3 From 955d2f42ada79e77aabe2edda4815a549ef3f948 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 16:16:11 -0400 Subject: libre/iceweasel: Build all of the branding bitmaps in prepare() --- libre/iceweasel/PKGBUILD | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 48e153d9a..9f422a165 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -140,7 +140,7 @@ END install -m644 -t browser/extensions/onboarding/content/img -- \ "$brandingdir/branding/watermark.svg" # produce icons - for i in 128; do + for i in 16 22 24 32 48 64 128 192 256 384; do rsvg-convert -w $i -h $i "$brandingdir/branding/${pkgname}_icon.svg" \ -o "browser/branding/iceweasel/default$i.png" done @@ -512,8 +512,6 @@ app.partner.parabola=parabola END for i in 16 22 24 32 48 64 128 192 256 384; do - rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_brandingver/branding/${pkgname}_icon.svg" \ - -o "browser/branding/iceweasel/default$i.png" install -Dm644 "browser/branding/iceweasel/default$i.png" \ "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" done -- cgit v1.2.3 From f9a1590982ef6195c1de8266148af4d17bdf2bff Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 16:22:57 -0400 Subject: libre/iceweasel: Tidy branding install --- libre/iceweasel/PKGBUILD | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 9f422a165..0a794be94 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -512,11 +512,10 @@ app.partner.parabola=parabola END for i in 16 22 24 32 48 64 128 192 256 384; do - install -Dm644 "browser/branding/iceweasel/default$i.png" \ + install -Dm644 browser/branding/$pkgname/default$i.png \ "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" done - - install -Dm644 "$srcdir/$pkgname-$_brandingver/branding/${pkgname}_icon.svg" \ + install -Dm644 "browser/branding/$pkgname/${pkgname}_icon.svg" \ "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg" install -Dm644 ../$pkgname.desktop \ -- cgit v1.2.3 From 2d1e7216e3f3b54fd97793df779535ccec6d1e90 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 16:46:04 -0400 Subject: libre/iceweasel: Add a comment about needing to prune BS --- libre/iceweasel/PKGBUILD | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 0a794be94..5b0fc5d70 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -198,6 +198,14 @@ pref("extensions.shownSelectionUI", true); END # Parabola additions to vendor.js + # + # TODO: Go through this and figure out what's nescessary, remove + # most of it. This is mostly cargo-cult BS. For example, disabling + # all the EME stuff... that's already off because of `--disable-eme` + # in `.mozconfig`. Some of these settings no longer exist. Some of + # these settings don't do anything on GNU/Linux. + # + # However, they don't seem to be causing any of the critical issues. local _shortver=$(cut -d. -f1,2 <<<"$pkver") cat >> "$_vendorjs" < Date: Thu, 23 Aug 2018 16:54:55 -0400 Subject: libre/iceweasel: Fixup libre.patch - There is no Iceweasel OS, that is over-zealous - "Iceweasel's" instead of "Iceweasel'" --- libre/iceweasel/PKGBUILD | 8 ++++---- libre/iceweasel/libre.patch | 15 +-------------- 2 files changed, 5 insertions(+), 18 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 5b0fc5d70..46a8e85bc 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -62,7 +62,10 @@ _repo=https://hg.mozilla.org/mozilla-unified source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" $pkgname.desktop) sha256sums=('SKIP' - 'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa') + 'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa' + 'dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e' + 'SKIP' + 'b695926b8a1f9560f0e11e0bad2ef42df6152d4f16f95af1027bc12c487c1ede') # Branding _brandingver=$(cut -d. -f1,2<<<"$pkgver") @@ -70,9 +73,6 @@ _brandingrel=1 makedepends+=(mozilla-searchplugins quilt libxslt imagemagick) source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig} libre.patch) -sha256sums+=('dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e' - 'SKIP' - 'f2f3484a5339c7208a2a44b63a185ec5a57f837040627d29cc45b4d1d14ef6c2') validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin prepare() { diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index d8b9f7171..ef89d0853 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -332,19 +332,6 @@ index 842d549f0..31dcb82e5 100644 # Scratchpad and the Style Editor tools. # LOCALIZATION NOTE The correct localization of this file might be to keep it -diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales/en-US/toolbox.dtd -index 6097fa82a..3dfe372db 100644 ---- a/devtools/client/locales/en-US/toolbox.dtd -+++ b/devtools/client/locales/en-US/toolbox.dtd -@@ -81,7 +81,7 @@ - - checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled - - boolean preference in about:config, in the options panel. --> - -- -+ - - -+ ++ -- cgit v1.2.3 From 7ae72ab38b8ca2d4f12414ef6a4528cde31ebc7e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 23:15:37 -0400 Subject: libre/iceweasel: Make the icu version dep automatic --- libre/iceweasel/PKGBUILD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 46a8e85bc..00a88746e 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -50,7 +50,6 @@ license=(MPL GPL LGPL) url="https://wiki.parabola.nu/$pkgname" depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg nss hunspell-en_US sqlite ttf-font libpulse libvpx icu) -depends+=('icu>=62' 'icu<63') makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb autoconf2.13 rust mercurial clang llvm jack gtk2 python) optdepends=('networkmanager: Location detection via available WiFi networks' @@ -177,6 +176,10 @@ build() { } package() { + local _icu_ver + _icu_ver=$(pacman -S --print-format='%v' icu) + depends+=("icu>=${_icu_ver}" "icu<$((${_icu_ver%%.*} + 1))") + cd mozilla-unified DESTDIR="$pkgdir" ./mach install find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} + -- cgit v1.2.3 From f9d616c409c082e1b55b45700a79f8f7c0b6d3f9 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 23 Aug 2018 23:15:51 -0400 Subject: libre/iceweasel: Clean up rationale comment --- libre/iceweasel/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 00a88746e..abf995707 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -20,10 +20,10 @@ # Contributor: Muhammad 'MJ' Jassim # Rational for inclusion in [libre]: -# - For FSDG compliance, we must modify the addons pages to use GNU -# IceCat plugins sources, rather than addons.mozilla.org, which -# hosts non-free addons. -# - Disable EME (implemented via the libWideVine CDM) +# - Modify the addons pages to use GNU IceCat plugins sources, rather +# than addons.mozilla.org, which hosts non-free addons. +# - Disable EME, which is implemented via the non-free libWideVine +# CDM. # # The above changes cause us to run afoul of the Firefox trademark # policy[1], so making those changes also requires us to: @@ -31,7 +31,7 @@ # # While we're at it, while not strictly nescessary for FSDG # compliance: -# - Remove google api keys and usage +# - Remove Google API keys and usage # - Disable Mozilla telemetry and crash reporting (good manners # because of all of the other patching we're doing # -- cgit v1.2.3 From de461117e7e2858346b1c1194bda9435e862f5ea Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 25 Aug 2018 17:01:52 -0400 Subject: libre/iceweasel: Fix the branding in a patch --- .../iceweasel/0001-branding-Fix-for-v60-v61.patch | 72 ++++++++++++++++++++++ libre/iceweasel/PKGBUILD | 10 ++- 2 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 libre/iceweasel/0001-branding-Fix-for-v60-v61.patch (limited to 'libre/iceweasel/PKGBUILD') diff --git a/libre/iceweasel/0001-branding-Fix-for-v60-v61.patch b/libre/iceweasel/0001-branding-Fix-for-v60-v61.patch new file mode 100644 index 000000000..2651473ad --- /dev/null +++ b/libre/iceweasel/0001-branding-Fix-for-v60-v61.patch @@ -0,0 +1,72 @@ +From 1e6b9c496d27014f988d83f6b20625a9eb4c624a Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Sat, 25 Aug 2018 17:29:32 -0400 +Subject: [PATCH] branding: Fix for v60/v61 + + - Makefile.in doesn't respect VPATH + - firefox-branding.js uses lockPref(), which no longer exists + - brand.dtd sets trademarkInfo.part2, which no longer exists + - brand.properties doesn't set syncBrandShortName + - brand.ftl doesn't exist, but it needs to + +--- + branding/Makefile.in | 2 +- + branding/firefox-branding.js | 1 - + branding/locales/en-US/brand.dtd | 1 - + branding/locales/en-US/brand.ftl | 2 ++ + branding/locales/en-US/brand.properties | 2 ++ + 5 files changed, 5 insertions(+), 3 deletions(-) + create mode 100644 branding/locales/en-US/brand.ftl + +diff --git a/branding/Makefile.in b/branding/Makefile.in +index b395c62..deed5a6 100644 +--- a/branding/Makefile.in ++++ b/branding/Makefile.in +@@ -20,7 +20,7 @@ GARBAGE += $(BROWSER_APP_FILES) + + export:: $(BROWSER_APP_FILES) + $(NSINSTALL) -D $(DIST)/branding +- cp $(BROWSER_APP_FILES) $(DIST)/branding/ ++ cp $^ $(DIST)/branding/ + + GARBAGE += iceweasel.png + +diff --git a/branding/firefox-branding.js b/branding/firefox-branding.js +index 17cf43e..e92356e 100644 +--- a/branding/firefox-branding.js ++++ b/branding/firefox-branding.js +@@ -1,4 +1,3 @@ +-lockPref("browser.startup.homepage_override.mstone", "ignore"); + pref("browser.aboutHomeSnippets.updateUrl", "data:text/html,"); + pref("startup.homepage_override_url",""); + pref("startup.homepage_welcome_url",""); +diff --git a/branding/locales/en-US/brand.dtd b/branding/locales/en-US/brand.dtd +index 50c20d6..c83e6d0 100644 +--- a/branding/locales/en-US/brand.dtd ++++ b/branding/locales/en-US/brand.dtd +@@ -3,4 +3,3 @@ + + + +- +diff --git a/branding/locales/en-US/brand.ftl b/branding/locales/en-US/brand.ftl +new file mode 100644 +index 0000000..ca180e0 +--- /dev/null ++++ b/branding/locales/en-US/brand.ftl +@@ -0,0 +1,2 @@ ++-brand-short-name = Iceweasel ++-vendor-short-name = Mozilla +diff --git a/branding/locales/en-US/brand.properties b/branding/locales/en-US/brand.properties +index b69ae8d..ea073d6 100644 +--- a/branding/locales/en-US/brand.properties ++++ b/branding/locales/en-US/brand.properties +@@ -2,3 +2,5 @@ brandShorterName=Iceweasel + brandShortName=Iceweasel + brandFullName=Iceweasel + vendorShortName=Mozilla ++ ++syncBrandShortName=Sync +-- +2.18.0 + diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index abf995707..5ad29d5bf 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -64,6 +64,7 @@ sha256sums=('SKIP' 'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa' 'dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e' 'SKIP' + 'f2ebd5054b81a0f0f642b523a545145bdd5939e70b79c8129415cd1646cc6d74' 'b695926b8a1f9560f0e11e0bad2ef42df6152d4f16f95af1027bc12c487c1ede') # Branding @@ -71,6 +72,7 @@ _brandingver=$(cut -d. -f1,2<<<"$pkgver") _brandingrel=1 makedepends+=(mozilla-searchplugins quilt libxslt imagemagick) source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig} + 0001-branding-Fix-for-v60-v61.patch libre.patch) validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin @@ -122,8 +124,9 @@ END ## Rebranding local brandingdir="$srcdir/$pkgname-$_brandingver" - sed -i '/lockPref("browser.startup.homepage_override.mstone"/d' \ - "$brandingdir/branding/firefox-branding.js" + pushd "$brandingdir" + patch -Np1 -i "$srcdir/0001-branding-Fix-for-v60-v61.patch" + popd # file dump rm -rf -- browser/branding/$pkgname cp -aT -- $brandingdir/branding browser/branding/$pkgname @@ -143,7 +146,8 @@ END rsvg-convert -w $i -h $i "$brandingdir/branding/${pkgname}_icon.svg" \ -o "browser/branding/iceweasel/default$i.png" done - # Patch and remove anything that's left + + # Remove remaining non-free bits patch -Np1 -i "$srcdir/libre.patch" sed -i 's/Adobe Flash/SWF Player/g' -- \ browser/base/content/pageinfo/permissions.js \ -- cgit v1.2.3