diff options
| author | B Stack <bgstack15@gmail.com> | 2018-10-03 16:36:52 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-10-03 16:36:52 -0400 |
| commit | 9115099c40b267629f4b2da63d9ef9aa4c6fe76c (patch) | |
| tree | b782ac21935a1c84a8ade9656073f1f7c35609df /waterfox | |
| parent | use same freebsd_rev as before (diff) | |
| download | stackrpms-9115099c40b267629f4b2da63d9ef9aa4c6fe76c.tar.gz stackrpms-9115099c40b267629f4b2da63d9ef9aa4c6fe76c.tar.bz2 stackrpms-9115099c40b267629f4b2da63d9ef9aa4c6fe76c.zip | |
re-exclude a few freebsd patches before the higher rev number
Diffstat (limited to 'waterfox')
| -rwxr-xr-x | waterfox/waterfox-FreeBSD-patches-snapshot.sh | 33 | ||||
| -rw-r--r-- | waterfox/waterfox-chinfo-default-prefs.js | 1 | ||||
| -rw-r--r-- | waterfox/waterfox-cubeb-build.patch | 8 | ||||
| -rw-r--r-- | waterfox/waterfox.spec | 2 |
4 files changed, 2 insertions, 42 deletions
diff --git a/waterfox/waterfox-FreeBSD-patches-snapshot.sh b/waterfox/waterfox-FreeBSD-patches-snapshot.sh deleted file mode 100755 index b94f850..0000000 --- a/waterfox/waterfox-FreeBSD-patches-snapshot.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -set -e - -module=$(basename "$0" -snapshot.sh) -snaproot="https://svn.freebsd.org/ports/head/www/waterfox/files" - -tmp=$(mktemp -d) - -trap cleanup EXIT -cleanup() { - set +e - ([ -z "${tmp}" ] || [ ! -d "${tmp}" ]) || rm -rf "${tmp}" -} - -unset CDPATH -unset SNAP_COOPTS -pwd=$(pwd) -snap=${snap:-$(date +%Y%m%d)} - -[ "${snap}" = "$(date +%Y%m%d)" ] || SNAP_COOPTS="-r {$snap}" -if [ -n "${rev}" ] ; then - SNAP_COOPTS="-r ${rev}" - snap="${rev}" -fi - -pushd "${tmp}" - svn co ${SNAP_COOPTS} ${snaproot} ${module} - rev=$(svnversion "${module}") - rev="${rev//[!0-9]/}" - mv "${module}" "${module}-r${rev}" - tar -Jcf "${pwd}/${module}-r${rev}.tar.xz" --exclude=.svn "${module}-r${rev}" -popd >/dev/null diff --git a/waterfox/waterfox-chinfo-default-prefs.js b/waterfox/waterfox-chinfo-default-prefs.js index 39acead..acc7de5 100644 --- a/waterfox/waterfox-chinfo-default-prefs.js +++ b/waterfox/waterfox-chinfo-default-prefs.js @@ -11,6 +11,7 @@ pref("browser.display.use_system_colors", true); pref("browser.download.folderList", 1); pref("browser.link.open_external", 3); pref("browser.shell.checkDefaultBrowser", false); +pref("browser.urlbar.trimURLs", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); diff --git a/waterfox/waterfox-cubeb-build.patch b/waterfox/waterfox-cubeb-build.patch deleted file mode 100644 index 39d04f4..0000000 --- a/waterfox/waterfox-cubeb-build.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- Waterfox-56.0.2/media/libcubeb/src/moz.build.cubebbuild 2018-01-05 16:39:00.921101411 -0200 -+++ Waterfox-56.0.2/media/libcubeb/src/moz.build 2018-01-05 16:40:44.948718748 -0200 -@@ -89,4 +89,4 @@ CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] - CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] - - # We allow warnings for third-party code that can be updated from upstream. --AllowCompilerWarnings() -+ALLOW_COMPILER_WARNINGS = True diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 215a9ac..d45d31f 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -388,7 +388,7 @@ done # 2: no apply # 3: uncertain for i in \ - 702179 991253 1021761 1144632 1288587 1452576 \ + 702179 991253 1021761 1144632 1288587 1452576 1425930 1469914 1469309 1470260 1472925 \ 1388744 1413143 \ 1447519 do |