diff options
Diffstat (limited to 'libre/iceweasel')
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 6e16afe7c..fd4af18e6 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -50,8 +50,7 @@ epoch=1 pkgver=85.0 pkgrel=1 pkgrel+=.parabola1 -_brandingver=85.0 -_brandingrel=1 +_brandingver=85.0-1 pkgdesc="Standalone web browser derived from Mozilla Firefox" arch=(x86_64) arch+=(i686 armv7h) @@ -61,10 +60,8 @@ depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse) makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 nodejs cbindgen nasm python-setuptools python-psutil python-zstandard lld) -# FIXME: 'mozilla-serarchplugins' package needs re-working (see note in prepare()) makedepends+=(quilt libxslt imagemagick git jq python-jsonschema) -# i686: hotfix broken rust linking -makedepends_i686+=(llvm10-libs) +makedepends_i686+=(llvm10-libs) # FIXME: i686: hotfix broken rust linking optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' @@ -75,7 +72,7 @@ options=(!emptydirs !makeflags !strip) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} 0001-Use-remoting-name-for-GDK-application-names.patch $pkgname.desktop) -source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig} +source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig} 9001-always-sync-remote-settings-with-local-dump.patch 9002-misc-libre.patch process-json-files.py @@ -87,13 +84,13 @@ source_i686=('avoid-libxul-OOM-python-check.patch' sha256sums=('5f03712642f5e77de4581d2ba3ee3e87cfa44c3d2fdd8fe0fb56ea05a57f7b50' 'SKIP' '8b236bbf3ae5cb28d1dd742f543c0079fac06af5aa80bc2051defeba95f0ae21' - '44be8e819b8334ed36e9410d62dbc6c16dd8f8329a191403bfdce3cf2e9181fc' - '8551c30ee25a90455e65bbd7dc0ffe85eb6a51f1205413914110f879019dc038' - 'SKIP' - 'cf304339edb8ec46bcf6aa410f646ee3df0813387ce0b3ef2c7b27d3a25e8935' - '4512ad17a6f9d07b1c146abf5c44dcdf5442cfbe6e8af662db431d5a01a34883' - 'e9d1b74971d58c5b860601bd8c0c11df332dab8be2f61f5d238ba50a5c4efdde' - '714998c5fc379f54a66ff80a845b7880169cd5b4094b77b719a99d33b65c0940') + '44be8e819b8334ed36e9410d62dbc6c16dd8f8329a191403bfdce3cf2e9181fc') +sha256sums+=('d5948c444b60de0b9e80598c4bc5151ad9d1fa59b6e3b28246c0c816541bc86c' + 'SKIP' + 'cf304339edb8ec46bcf6aa410f646ee3df0813387ce0b3ef2c7b27d3a25e8935' + '4512ad17a6f9d07b1c146abf5c44dcdf5442cfbe6e8af662db431d5a01a34883' + 'e9d1b74971d58c5b860601bd8c0c11df332dab8be2f61f5d238ba50a5c4efdde' + '714998c5fc379f54a66ff80a845b7880169cd5b4094b77b719a99d33b65c0940') sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353' '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041') sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966' @@ -255,7 +252,7 @@ END ## branding ## echo "applying parabola branding" - local brandingsrcdir="${srcdir}"/${pkgname}-${_brandingver} + local brandingsrcdir="${srcdir}"/${pkgname}-${_brandingver/-*} local brandingdestdir=browser/branding/${pkgname} rm -rf -- ${brandingdestdir} cp -aT -- ${brandingsrcdir}/branding ${brandingdestdir} @@ -273,7 +270,6 @@ END # the new upstream start page ('activity-streams') is an add-on now # it must be forked and customized externally, then copied into the browser tree # see: the branding-dev-build/ dir on the '68.0' branch of the branding git repo - # that will also be useful for creating a replacement 'mozilla-searchplugins' package # some of the branding components above and commented out below may no longer be used # the following section aims to restore something similar # to the previous parabola-branded "start page" |