diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-10-26 22:17:05 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-10-29 01:22:52 -0400 |
| commit | a06193603b7e7922439fc5a9d616b7ef872b8b03 (patch) | |
| tree | 857e11491324139734598037cc0a3774d694a751 /gnu/packages/patches/icecat-makeicecat.patch | |
| parent | ce23c5ffd2cbb123943c424f09d1442f557a14ed (diff) | |
| download | guix-a06193603b7e7922439fc5a9d616b7ef872b8b03.tar.gz | |
gnu: icecat: Include generally-useful fixes in the source tarball.
This commit moves some important fixes into a patch applied to the upstream gnuzilla git repository, whereas previously they were applied in such a way that only benefitted Guix users. * gnu/packages/patches/icecat-default-search-ddg.patch, gnu/packages/patches/icecat-disable-sync.patch: Delete files. * gnu/packages/patches/icecat-gnuzilla-fixes.patch: New file. * gnu/local.mk (dist_patch_DATA): Adapt accordingly. * gnu/packages/gnuzilla.scm (icecat-source): Apply the new patch to the gnuzilla checkout. (icecat)[native-inputs]: Remove deleted patches. [arguments]: In the 'wrap-program' phase, remove MOZ_LEGACY_PROFILES=1 from the wrapper.
Diffstat (limited to 'gnu/packages/patches/icecat-makeicecat.patch')
| -rw-r--r-- | gnu/packages/patches/icecat-makeicecat.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index f0b36d7d52..a9920d6474 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -96,8 +96,8 @@ index b04c731..06d1f3f 100644 -cd $SOURCEDIR +# cd $SOURCEDIR - #for patch in $DATA/patches/*; do - # echo Patching with file: $patch + for patch in $DATA/patches/*.patch; do + echo Patching with file: $patch @@ -226,10 +226,10 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i |