diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 19 | ||||
| -rw-r--r-- | libre/iceweasel/enable-object-directory-paths.patch | 13 | ||||
| -rw-r--r-- | libre/iceweasel/mozconfig | 2 |
3 files changed, 24 insertions, 10 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 6d3fe387e..2f4f91182 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -57,12 +57,13 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz" $pkgname-install-dir.patch vendor.js no-libnotify.patch - $pkgname-gtk3-20.patch) + $pkgname-gtk3-20.patch + enable-object-directory-paths.patch) sha256sums=('1d14cca3f25ee017f087c4e6e90ec6f35ba82093d012fff4567504c9554fa025' '4d7935acc724796b01d39773cfa9bbd50c3de91b2bca67812b376336398efeb1' '69736106a9c96fdbca2fb82bd8fbceddf2ab87940ff42bc92cfaed716363310e' 'SKIP' - '398f3c0fd7fad657f564bbb7fe5b494268855d1ac88d6c56f25c2dedf18cb6e5' + '4e7471f993e8863ddf96cc1fa24ccdf7c2b36fea0020d8a9d0d8e5bccd605a34' '0b47b95cfa4a56a1292be7107c9a59e4575bac8bc1e1fb7e1359755069919751' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' @@ -70,7 +71,8 @@ sha256sums=('1d14cca3f25ee017f087c4e6e90ec6f35ba82093d012fff4567504c9554fa025' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' 'e6e43c6b481891e33dbb95849865410a2a9e77165f7de2c2057d3a8bab990aec' 'e4ebdd14096d177d264a7993dbd5df46463605ff45f783732c26d30b9caa53a7' - '440c3e22d98ecf8c44dcedbe90bbb302da3a059e3fc3fba205d89f0eca329cbf') + '440c3e22d98ecf8c44dcedbe90bbb302da3a059e3fc3fba205d89f0eca329cbf' + 'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484') validpgpkeys=( 'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva @@ -93,6 +95,9 @@ prepare() { install -m644 "$srcdir/"{gnu_headshadow,drm-free}.png \ browser/base/content/abouthome + # Enable object directory paths for Iceweasel rebranding + patch -Np1 -i "$srcdir/enable-object-directory-paths.patch" + # Install to /usr/lib/$pkgname patch -Np1 -i "$srcdir/$pkgname-install-dir.patch" @@ -120,10 +125,6 @@ prepare() { mkdir "$srcdir/path" ln -s /usr/bin/python2 "$srcdir/path/python" - # Configure script misdetects the preprocessor without an optimization level - # https://bugs.archlinux.org/task/34644 - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure - # Load our searchplugins rm -rv browser/locales/en-US/searchplugins cp -av /usr/lib/mozilla/searchplugins browser/locales/en-US @@ -132,8 +133,10 @@ prepare() { build() { cd "$srcdir/$_pkgname-$_debver" + # _FORTIFY_SOURCE causes configure failures + CPPFLAGS+=" -O2" + export PATH="$srcdir/path:$PATH" - export PYTHON="/usr/bin/python2" if $_pgo; then # Do PGO diff --git a/libre/iceweasel/enable-object-directory-paths.patch b/libre/iceweasel/enable-object-directory-paths.patch new file mode 100644 index 000000000..bc938c66e --- /dev/null +++ b/libre/iceweasel/enable-object-directory-paths.patch @@ -0,0 +1,13 @@ +diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py +index 41ae8ae..dcc3263 100644 +--- a/python/mozbuild/mozbuild/frontend/context.py ++++ b/python/mozbuild/mozbuild/frontend/context.py +@@ -408,8 +408,6 @@ class Path(ContextDerivedValue, unicode): + class SourcePath(Path): + """Like Path, but limited to paths in the source directory.""" + def __init__(self, context, value): +- if value.startswith('!'): +- raise ValueError('Object directory paths are not allowed') + if value.startswith('%'): + raise ValueError('Filesystem absolute paths are not allowed') + super(SourcePath, self).__init__(context, value) diff --git a/libre/iceweasel/mozconfig b/libre/iceweasel/mozconfig index 433740e9b..0db171c8e 100644 --- a/libre/iceweasel/mozconfig +++ b/libre/iceweasel/mozconfig @@ -38,5 +38,3 @@ ac_add_options --disable-eme # Other mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir - -# vim:set ft=sh: |