@figue, tested it works. Once I have a chance i'm gonna report on gnu side.
Bascially -r xargs switch does nothing harmful, can't break anything.
Git Clone URL: | https://aur.archlinux.org/icecat.git (read-only, click to copy) |
---|---|
Package Base: | icecat |
Description: | GNU version of the Firefox ESR browser |
Upstream URL: | https://git.savannah.gnu.org/cgit/gnuzilla.git |
Keywords: | browser esr gnuzilla web |
Licenses: | MPL-2.0 |
Submitter: | None |
Maintainer: | figue (xiota) |
Last Packager: | xiota |
Votes: | 251 |
Popularity: | 0.82 |
First Submitted: | 2007-12-09 10:12 (UTC) |
Last Updated: | 2024-04-29 09:15 (UTC) |
« First ‹ Previous 1 2 3 4 5 6 7 8 9 10 11 .. 84 Next › Last »
@figue, tested it works. Once I have a chance i'm gonna report on gnu side.
Bascially -r xargs switch does nothing harmful, can't break anything.
Ok, I was able to build it with the changes mentioned. Note that the additional sed lines must be used outside the $_SPEED
if statement block to apply to both kinds of builds (with and without _SPEED=y
).
Something must have changed with the languages repositories, since the build without _SPEED=y
doesn't work anymore (though it used to build a few days ago). Building in a clean chroot btw. I'm currently testing the build with the following changes to be applied to builds with/without _SPEED=y
:
# Thanks to cysp74 to report this bug
sed -e 's;find l10n -wholename '\''\*/brand.dtd'\'' | xargs;find l10n -wholename '\''\*/brand.dtd'\'' | xargs -r;g' -i makeicecat
sed -e 's;find l10n -wholename '\''\*/brand.ftl'\'' | xargs;find l10n -wholename '\''\*/brand.ftl'\'' | xargs -r;g' -i makeicecat
Patch pushed 67ac93909fa9 but I didn't bump pkgrel. Please test it.
@cysp74 I see, it's the _SPEED=Y... I'll patch.
I believe StartupWMClass
in icecat.desktop
should be icecat-default
.
$ xprop WM_CLASS
WM_CLASS(STRING) = "Navigator", "icecat-default"
@figue Ok, here is my workflow (without the ""patch""):
rm -Rf icecat
git clone https://aur.archlinux.org/icecat.git
cd icecat
_SPEED=Y makepkg -srf --noconfirm
(At first try I didn't delete the directory ofcoz, but had the same yield)
This throws:
Running modification-aware sed: sed /ifndef/,/endif/d -i browser/base/content/default-bookmarks.html
+ /bin/sed /ifndef/,/endif/d -i browser/base/content/default-bookmarks.html
++ md5sum browser/base/content/default-bookmarks.html
+ '[' '3337c5c47d38487cc8936b828ff3ae58 browser/base/content/default-bookmarks.html' = '1260ccbb3f4cb12686128af1766c5616 browser/base/content/default-bookmarks.html' ']'
+ find l10n -wholename '*/brand.dtd'
+ xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version.">/' -i
/bin/sed: no input files
==> ERROR: A failure occurred in prepare().
Aborting...
==> Removing installed dependencies...
checking dependencies...
@cysp74 I've built it 2 times yesterday and makeicecat finished success both... Are you sure we need to replace that line with "xargs -r"?
Due to upstream bug (in makeicecat script) compile ran to error and I've made a quickfix. However I have no additional time slot for this, so @figue reporting this to gnu would be good. Or we can simply put this to an ""temporary"" patch file, include into PKGBUILD - as I did.
--- makeicecat.old 2023-07-06 11:26:16.660192912 +0200
+++ makeicecat 2023-07-06 11:43:03.986990506 +0200
@@ -527,7 +527,7 @@
sed '/ifndef/,/endif/d' -i browser/base/content/default-bookmarks.html
# Custom legal about pages
- find l10n -wholename '*/brand.dtd' | xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "The IceCat logo is Copyright
2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later versio
n.">/' -i
+ find l10n -wholename '*/brand.dtd' | xargs -r /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "The IceCat logo is Copyrig
ht 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later ver
sion.">/' -i
find l10n -wholename '*/brand.ftl' | xargs /bin/sed 's/^trademarkInfo = .*/trademarkInfo = The IceCat logo is Copyright 2008-20
15 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version./' -i
local string
for string in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-w
ebservices rights-safebrowsing
Thank you @Charlie.f94b92. I forgot to push those changes in git! :(
Pinned Comments
xiota commented on 2024-02-27 10:57 (UTC) (edited on 2024-02-27 10:59 (UTC) by xiota)
icecatbrowser.org
is unofficial, separate from GNU, which is stated at the site itself.classictetris.net
is used by the site owner to serve the prepatched sources. They are used only when_build_prepatched=true
to save time by skipping the patching step. The default isfalse
.The site was created to fill the gap after GNU stopped distributing prepatched sources and binaries. As far as I can tell, the
makeicecat
script is run without any modification, while this PKGBUILD does make some changes. For version 115.8.0, the only differences between the prepatched sources and a fresh patch from this PKGBUILD are:services/settings/dumps/monitor/changes
– "last_modified" and "collection" entries are different. This is expected because timestamps differ based on whenmakeicecat
is run.Some different
l10n
files (translations). This is also somewhat expected because the latest commit is checked out prior to patching. Exact contents can differ based on when the script is run..hg*
files and directories. They are not needed, and this PKGBUILD deletes them.xiota commented on 2024-02-26 07:32 (UTC) (edited on 2024-03-13 20:04 (UTC) by xiota)
PKGBUILD has been updated. Major changes:
Test builds can be expedited by:
_build_prepatched=true
Notes:
_build_pgo_xvfb=false
. This will usexwayland-run
for profiling._build_pgo=false
.mk_add_options MOZ_PARALLEL_BUILD=___
around line 300. Pick a value less than number of cores and free RAM in GB. For example, on a system with 8 cores, 64GB total RAM, but only 6 GB free, the value should be set to 4 or 5.Having problems? Please provide details: processor make and model, number of cores,
free -m
, full log in pastebin, whether using AUR helper/makepkg/clean chroot, etc.