diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-23 16:01:27 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-23 16:05:22 -0400 |
commit | 689e997085c3b24cd438933cd928b5b1f898f875 (patch) | |
tree | cc2c9e112bbbe6000831fe9e4246e46e8ed0c08b | |
parent | a1ede4bc976b652af13a38fb3972d257828c5293 (diff) | |
download | abslibre-689e997085c3b24cd438933cd928b5b1f898f875.tar.gz abslibre-689e997085c3b24cd438933cd928b5b1f898f875.tar.bz2 abslibre-689e997085c3b24cd438933cd928b5b1f898f875.zip |
libre/iceweasel: For merging changes, clearly separate our vendor.js from Arch's
-rw-r--r-- | libre/iceweasel/PKGBUILD | 5 |
1 files changed, 4 insertions, 1 deletions
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" <<END // Use LANG environment variable to choose locale @@ -196,7 +195,11 @@ pref("browser.shell.checkDefaultBrowser", false); // Don't disable our bundled extensions in the application directory pref("extensions.autoDisableScopes", 11); pref("extensions.shownSelectionUI", true); +END + # Parabola additions to vendor.js + local _shortver=$(cut -d. -f1,2 <<<"$pkver") + cat >> "$_vendorjs" <<END // Disable "alt" as a shortcut key to open full menu bar. Conflicts with "alt" as a modifier pref("ui.key.menuAccessKeyFocuses", false); |