summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDet2017-11-04 15:01:16 +0200
committerDet2017-11-04 15:01:16 +0200
commit0954c6ddb8397f07dfdac9fdc55b52785b64897d (patch)
tree804fcc5bd5a9f044e061e97b9a5784ffb284ffb5
parent8ae4a74c5e3902e08209645fb0a93c3c3b13d1b9 (diff)
downloadaur-0954c6ddb8397f07dfdac9fdc55b52785b64897d.tar.gz
Spell-check/hyphenation + certs
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD18
2 files changed, 18 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 012f0efb08af..9480fdd1082a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,9 +14,11 @@ pkgbase = firefox-beta-bin
depends = libxt
depends = nss
optdepends = ffmpeg: H264/AAC/MP3 decoding
+ optdepends = hunspell: Spell checking
+ optdepends = hyphen: Hyphenation
optdepends = libnotify: Notification integration
optdepends = networkmanager: Location detection via available WiFi networks
- optdepends = pulseaudio
+ optdepends = pulseaudio: Sound
optdepends = upower: Battery API
provides = firefox=57.0b14
source = firefox-beta.sh
diff --git a/PKGBUILD b/PKGBUILD
index dad07ac65d63..e0060a882160 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,9 +13,11 @@ url="https://www.mozilla.org/en-US/firefox/channel/#beta"
license=('MPL' 'GPL' 'LGPL')
depends=('dbus-glib' 'gtk3' 'libxt' 'nss')
optdepends=('ffmpeg: H264/AAC/MP3 decoding'
+ 'hunspell: Spell checking'
+ 'hyphen: Hyphenation'
'libnotify: Notification integration'
'networkmanager: Location detection via available WiFi networks'
- 'pulseaudio'
+ 'pulseaudio: Sound'
'upower: Battery API')
provides=("firefox=$pkgver")
install=$pkgname.install
@@ -38,7 +40,6 @@ package() {
msg2 "Creating directory structure..."
mkdir -p "$pkgdir"/usr/bin
mkdir -p "$pkgdir"/usr/share/applications
- mkdir -p "$pkgdir"/usr/share/icons/hicolor/128x128/apps
mkdir -p "$pkgdir"/opt
msg2 "Moving stuff in place..."
@@ -48,6 +49,7 @@ package() {
# Launchers
install -m755 $_pkgname.sh "$pkgdir"/usr/bin/$_pkgname
ln -s $_pkgname "$pkgdir"/usr/bin/$pkgname # compatibility
+ ln -sf firefox "$pkgdir"/opt/$_pkgname/firefox-bin
# Desktops
install -m644 *.desktop "$pkgdir"/usr/share/applications/
@@ -60,6 +62,16 @@ package() {
done
# 128x128
+ install -d "$pkgdir"/usr/share/icons/hicolor/128x128/apps/
ln -s /opt/$_pkgname/browser/icons/mozicon128.png \
"$pkgdir"/usr/share/icons/hicolor/128x128/apps/$_pkgname.png
-} \ No newline at end of file
+
+ # Use system-provided dictionaries
+ rm -r "$pkgdir"/opt/$_pkgname/dictionaries
+ ln -Ts /usr/share/hunspell "$pkgdir"/opt/$_pkgname/dictionaries
+ ln -Ts /usr/share/hyphen "$pkgdir"/opt/$_pkgname/hyphenation
+
+ # Use system certificates
+ ln -srf "$pkgdir"/usr/lib/libnssckbi.so \
+ "$pkgdir"/opt/$_pkgname/libnssckbi.so
+}