diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2023-04-01 15:45:10 -0400 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2023-04-02 00:37:12 -0400 |
commit | 106e2eb1485a865cad2d9d3f67641524a1eb8099 (patch) | |
tree | 82b1e942e6128df645a55dbb68835e2e496d972b /libre/iceweasel/PKGBUILD | |
parent | 3a0861f37a945cb90c71ce74aaeebaf573a60081 (diff) |
[icecat][icedove][icewesel]: minimize diffs across PKGBUILDs
Diffstat (limited to 'libre/iceweasel/PKGBUILD')
-rw-r--r-- | libre/iceweasel/PKGBUILD | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 8dfca100f..ec729d47c 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -23,7 +23,7 @@ # Contributor: grizzlyuser <grizzlyuser@protonmail.com> -# parabola changes and rationale +# parabola changes and rationale: # libre: # - Modify the addons pages to use GNU IceCat plugins sources, rather # than addons.mozilla.org, which hosts non-free addons @@ -73,7 +73,8 @@ epoch=1 pkgver=111.0.1 pkgrel=1 pkgrel+=.parabola1 -_brandingver=102.0-1 +_brandingver=102.0 +_brandingrel=1 pkgdesc="Standalone web browser derived from Mozilla Firefox" url=https://wiki.parabola.nu/Iceweasel arch=(x86_64) @@ -157,7 +158,7 @@ source=( ) source=(${source[*]/identity-icons-brand.svg/}) # branding over-ride source+=( - https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig} + https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig} 9001-FSDG-sync-remote-settings-with-local-dump.patch 9002-FSDG-preference-defaults.patch 9003-FSDG-urihandlers.patch @@ -349,6 +350,7 @@ prepare() { mkdir mozbuild cd firefox-$pkgver + ## technical patching ## # https://bugzilla.mozilla.org/show_bug.cgi?id=1819374 @@ -560,15 +562,22 @@ END ## branding ## - echo "applying parabola branding" - local brandingsrcdir="${srcdir}"/${pkgname}-${_brandingver/-*} - local brandingdestdir="${srcdir}"/firefox-${pkgver}/browser/branding/${pkgname} + local branding_srcdir="${srcdir}"/${pkgname}-${_brandingver} + local branding_destdir="${srcdir}"/firefox-${pkgver}/browser/branding/${pkgname} local tippytopdir="${srcdir}"/firefox-${pkgver}/browser/components/newtab/data/content/tippytop - local blank_svg='<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"></svg>' - rm -rf -- ${brandingdestdir} - cp -aT -- ${brandingsrcdir}/branding ${brandingdestdir} + local blank_svg='<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"></svg>' # TODO: branding package - pushd "${brandingdestdir}" > /dev/null + # apply branding + echo "applying parabola branding" + export QUILT_PATCHES="${branding_srcdir}"/patches + export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' + export QUILT_DIFF_ARGS='--no-timestamps' + export QUILT_PC="${srcdir}"/.pc + rm -rf -- ${branding_destdir} + cp -aT -- ${branding_srcdir}/branding ${branding_destdir} + quilt push -av + + pushd "${branding_destdir}" > /dev/null # generate icons, logos, banners for size in 16 22 24 32 48 64 128 256 @@ -581,7 +590,7 @@ END rsvg-convert -w 384 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo@2x.png cp content/about-logo.png content/about-logo-private.png cp content/about-logo@2x.png content/about-logo-private@2x.png - echo ${blank_svg} > content/blank.svg + echo "${blank_svg}" > content/$pkgname-symbolic.svg # TODO: branding package popd > /dev/null @@ -597,16 +606,16 @@ END # and any unused branding components may be deleted from the branding package # Put "Start Page" branding images in the source code # install -m644 -t browser/base/content/abouthome -- \ - # "${brandingsrcdir}/branding"/{drm-free,gnu_headshadow,parabola-banner}.png + # "${branding_srcdir}/branding"/{drm-free,gnu_headshadow,parabola-banner}.png # install -m644 -t browser/extensions/onboarding/content/img -- \ - # "${brandingsrcdir}/branding/watermark.svg" + # "${branding_srcdir}/branding/watermark.svg" # process default Top Sites and their icons find ${tippytopdir} -type f \ -not -name 'wikipedia-org*' \ -not -name 'top_sites.json' \ -exec rm -v {} \; - for image in "${brandingsrcdir}"/tippytop/*.svg; do + for image in "${branding_srcdir}"/tippytop/*.svg; do local outname=$(basename -s .svg "${image}") local size=$(identify -format '%wx%h' ${tippytopdir}/images/wikipedia-org@2x.png) local background=$( [[ "${outname}" == 'gnu' ]] && echo 'white' || echo 'none' ) @@ -621,18 +630,11 @@ END "${tippytopdir}/favicons/${outname}.ico" done - # apply branding patches - export QUILT_PATCHES="${brandingsrcdir}"/patches - export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' - export QUILT_DIFF_ARGS='--no-timestamps' - export QUILT_PC="${srcdir}"/.pc - quilt push -av - # misc branding sed -i "s|({ \$bits }-bit)|($CARCH)|" browser/locales/en-US/browser/aboutDialog.ftl - ## searchengines ## + ## search-engines ## pushd browser/components/search/extensions > /dev/null @@ -674,7 +676,7 @@ END #sed -i '/pocket/d' browser/extensions/moz.build #sed -i '/activity-stream/d' browser/extensions/moz.build - python ../process-json-files.py "${srcdir}"/firefox-${pkgver} "${brandingsrcdir}" + python ../process-json-files.py "${srcdir}"/firefox-${pkgver} "${branding_srcdir}" # disable various phone-home/goelocation anti-featires echo "applying 9002-FSDG-preference-defaults.patch" @@ -848,7 +850,7 @@ END install -Dvm644 /dev/stdin "$distini" <<END [Global] id=parabola -version=(${_brandingver} branding) +version=(${_brandingver}-${_brandingrel} branding) about=${pkgname^} for Parabola GNU/Linux-libre about.en-US=${pkgname^} for Parabola GNU/Linux-libre about.eo=${pkgname^} por Parabola GNU/Linux-libre @@ -862,7 +864,7 @@ app.distributor.channel=$pkgname app.partner.parabola=parabola END - # NOTE: browser/branding/$theme is $brandingdestdir in prepare() + # NOTE: browser/branding/$theme is $branding_destdir in prepare() local i theme=$pkgname for i in 16 22 24 32 48 64 128 256; do install -Dvm644 browser/branding/$theme/default$i.png \ @@ -874,7 +876,7 @@ END "$pkgdir/usr/share/icons/hicolor/384x384/apps/$pkgname.png" install -Dvm644 browser/branding/$theme/content/about-logo.svg \ "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg" - install -Dvm644 browser/branding/$theme/content/blank.svg \ + install -Dvm644 browser/branding/$theme/content/$pkgname-symbolic.svg \ "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg" install -Dvm644 ../$pkgname.desktop \ |