summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO77
-rw-r--r--PKGBUILD100
-rw-r--r--firefox-esr-safe.desktop13
-rw-r--r--firefox-esr.desktop (renamed from firefox-esr-zh-cn.desktop)12
-rw-r--r--firefox-esr.install (renamed from firefox-esr-zh-cn.install)0
5 files changed, 109 insertions, 93 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c9dc3b9cf4d0..058d65ca93f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,45 @@
pkgbase = firefox-esr-zh-cn
-pkgdesc = Chinese Simplified For Firefox ESR
-pkgver = 52.1.2esr
-pkgrel = 1
-url = https://www.mozilla.org/zh-CN/firefox/channel/#esr
-install = firefox-esr-zh-cn.install
-arch = i686
-arch = x86_64
-license = MPL
-license = GPL
-license = LGPL
-makedepends = pacman>=4.2.0
-depends = alsa-lib
-depends = dbus-glib
-depends = desktop-file-utils
-depends = gtk2
-depends = gtk3
-depends = hicolor-icon-theme
-depends = icu
-depends = libevent
-depends = libvpx
-depends = libxt
-depends = mime-types
-depends = nss
-depends = sqlite
-optdepends = ffmpeg: additional video and audio decoders
-optdepends = libpulse: PulseAudio driver
-optdepends = networkmanager: Location detection via available WiFi networks
-optdepends = upower: Battery API
-provides = firefox=52.1.2esr
-source = firefox-esr-zh-cn.desktop
-source = vendor.js
-source = https://ftp.mozilla.org/pub/firefox/candidates/52.1.2esr-candidates/build1/linux-/zh-CN/firefox-52.1.2esr.tar.bz2
-sha512sums = SKIP
-sha512sums = SKIP
-sha512sums =
+ pkgdesc = Standalone web browser from mozilla.org - Extended Support Release in zh_CN
+ pkgver = 52.3.0
+ pkgrel = 1
+ url = https://www.mozilla.org/zh-CN/firefox/channel/#esr
+ install = firefox-esr.install
+ arch = i686
+ arch = x86_64
+ license = MPL
+ license = GPL
+ license = LGPL
+ depends = gtk3
+ depends = gtk2
+ depends = mozilla-common
+ depends = libxt
+ depends = startup-notification
+ depends = mime-types
+ depends = dbus-glib
+ depends = alsa-lib
+ depends = ffmpeg
+ depends = libvpx
+ depends = libevent
+ depends = nss
+ depends = hunspell
+ depends = sqlite
+ depends = ttf-font
+ depends = icu
+ optdepends = networkmanager: Location detection via available WiFi networks
+ optdepends = libnotify: Notification integration
+ optdepends = upower: Battery API
+ optdepends = speech-dispatcher: Text-to-Speech
+ provides = firefox=52
+ conflicts = firefox-esr
+ conflicts = firefox-esr-bin
+ source = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/52.3.0esr/linux-/zh-CN/firefox-52.3.0esr.tar.bz2
+ source = vendor.js
+ source = firefox-esr.desktop
+ source = firefox-esr-safe.desktop
+ sha512sums = c9e2b151600509ddbbb48dcadb7c68a0a9eabc5c6468797e7658c309f63def643d33336790c26301fc799f5fde161591b336f926ed4f7a365180be87b9016054
+ sha512sums = 64f9f5549328a699aeba3edc78cbcb2fa465b0319945b0e3b7c8d8cd0459c3bf3d583d168c1e99085a0b06a8ab92faa8398010ca020aaa4b98faa7e4051bc852
+ sha512sums = 02655fae9cc4d833442b59dc53cd14d831e28c4f3adce2da37fa5123c63d75d57dccca90e4415344fb31ca01d2c3dd9b83de1b8e20e04bed9036986ee01412a6
+ sha512sums = 8942b11a7cb3761de1185491397185743adf49daa27a2806d14a328a2be8e2cb566c71dc6449016549cb3bd0d328cfe15944490be749a4add213194f6153c3d0
+
pkgname = firefox-esr-zh-cn
diff --git a/PKGBUILD b/PKGBUILD
index 1d624584db4b..eecd460d42dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,57 @@
-# Maintainer: halflife <pigoig_At_gmail_com>
+# Maintainer: Allen Zhong <moeallenz AT gmail DOT com>
+# Previous Maintainer: halflife <pigoig_At_gmail_com>
+# Contributor: Manuel Kauschinger <admin at bruzzzla dot de>
+# Contributor: Will Adams <info at clementlumber dot com>
+# Contributor: T. Jameson Little <t.jameson.little at gmail dot com>
+# Contributor: Stephen Michael <ihateseptictanks at gmail dot com>
+# Contributor: Simon Tunnat <simon+aur@tunn.at>
+# Contributor: Bartlomiej Piotrowski <nospam@bpiotrowski.pl>
pkgname=firefox-esr-zh-cn
_pkgname=firefox-esr
-pkgver=52.1.2esr
+pkgver=52.3.0
pkgrel=1
-pkgdesc="Chinese Simplified For Firefox ESR"
+pkgdesc='Standalone web browser from mozilla.org - Extended Support Release in zh_CN'
+url='https://www.mozilla.org/zh-CN/firefox/channel/#esr'
arch=('i686' 'x86_64')
-url="https://www.mozilla.org/zh-CN/firefox/channel/#esr"
+
+depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib ffmpeg
+ libvpx libevent nss hunspell sqlite ttf-font icu)
+optdepends=('networkmanager: Location detection via available WiFi networks'
+ 'libnotify: Notification integration'
+ 'upower: Battery API'
+ 'speech-dispatcher: Text-to-Speech')
+provides=('firefox=52')
+conflicts=('firefox-esr' 'firefox-esr-bin')
license=('MPL' 'GPL' 'LGPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'gtk3' 'hicolor-icon-theme'
- 'icu' 'libevent' 'libvpx' 'libxt' 'mime-types' 'nss' 'sqlite')
-optdepends=('ffmpeg: additional video and audio decoders'
- 'libpulse: PulseAudio driver'
- 'networkmanager: Location detection via available WiFi networks'
- 'upower: Battery API')
-makedepends=('pacman>=4.2.0')
-provides=("firefox=$pkgver")
-install=$pkgname.install
-_baseurl="https://ftp.mozilla.org/pub/firefox/candidates/$pkgver-candidates/build$pkgrel/linux-${CARCH}/zh-CN/"
-_filename="firefox-$pkgver"
-_sha512sum="$(curl -s "${_baseurl}${_filename}.checksums" | grep "${_filename}.tar.bz2" | grep sha512 | cut -d " " -f1)"
-source=("$pkgname.desktop"
- "vendor.js"
- "${_baseurl}${_filename}.tar.bz2")
-sha512sums=('SKIP'
- 'SKIP'
- "${_sha512sum}")
+install=$_pkgname.install
+
+sha512sums=('c9e2b151600509ddbbb48dcadb7c68a0a9eabc5c6468797e7658c309f63def643d33336790c26301fc799f5fde161591b336f926ed4f7a365180be87b9016054'
+ '64f9f5549328a699aeba3edc78cbcb2fa465b0319945b0e3b7c8d8cd0459c3bf3d583d168c1e99085a0b06a8ab92faa8398010ca020aaa4b98faa7e4051bc852'
+ '02655fae9cc4d833442b59dc53cd14d831e28c4f3adce2da37fa5123c63d75d57dccca90e4415344fb31ca01d2c3dd9b83de1b8e20e04bed9036986ee01412a6'
+ '8942b11a7cb3761de1185491397185743adf49daa27a2806d14a328a2be8e2cb566c71dc6449016549cb3bd0d328cfe15944490be749a4add213194f6153c3d0')
+[[ "$CARCH" == "i686" ]] && sha512sums[0]='6bafc1a8a691dd8c81b2438be26d4efc4dc9cb61302866b471fb7eddc321bfb23950b3e09cc078f8a831cf02b7a7e6516440deb2fec49533e63f32638cf896c4'
+
+# if [[ -n "$FIREFOX_ESR_BIN_PREFER_OLDER" ]]; then
+ # pkgver=38.8.0
+ # provides=('firefox=38')
+ # sha512sums[0]='644dec9233a30b8929e8eb38aecab6f78be234c08c62fa038f7c8f5b8bdfed50ba053a402f92747e730147107d6e3408a21641de93792d35dc87967017065c90'
+ # [[ "$CARCH" == "i686" ]] && sha512sums[0]='25bd1f1be5c62b3b5acfae25bfefdb87ea20594730f1dec43ddec4af3d56b1b5b586c78f28595cda9c15904eb8d0b4806c312337d48d872361769a4fc81e3df3'
+# fi
+source=(http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}esr/linux-$CARCH/zh-CN/firefox-${pkgver}esr.tar.bz2
+ vendor.js
+ $_pkgname.desktop
+ $_pkgname-safe.desktop)
package() {
- # Create directories
- 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..."
- # Install
- rm -f firefox/update* firefox/icons/update*
- cp -r firefox/ "$pkgdir"/opt/$_pkgname
-
- # /usr/bin symlinks
- install -Dm644 ../vendor.js "$pkgdir/opt/$_pkgname/browser/defaults/preferences/vendor.js"
- ln -s /opt/$_pkgname/firefox "$pkgdir"/usr/bin/$_pkgname
- ln -s /opt/$_pkgname/firefox "$pkgdir"/usr/bin/$pkgname # compatibility
-
- # Desktops
- install -m644 *.desktop "$pkgdir"/usr/share/applications/
-
- # Icons
- for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
- install -d "$pkgdir"/usr/share/icons/hicolor/$i/apps/
- ln -s /opt/$_pkgname/browser/chrome/icons/default/default${i/x*}.png \
- "$pkgdir"/usr/share/icons/hicolor/$i/apps/$_pkgname.png
- done
-
- # 128x128
- ln -s /opt/$_pkgname/browser/icons/mozicon128.png \
- "$pkgdir"/usr/share/icons/hicolor/128x128/apps/$_pkgname.png
+ cd $srcdir
+
+ install -d $pkgdir/{usr/{bin,share/{applications,pixmaps}},opt}
+ cp -r firefox/ $pkgdir/opt/$_pkgname
+
+ install -Dm644 ../vendor.js "$pkgdir/opt/$_pkgname/browser/defaults/preferences/vendor.js"
+ ln -s /opt/$_pkgname/firefox $pkgdir/usr/bin/$_pkgname
+ install -m644 $srcdir/{$_pkgname.desktop,$_pkgname-safe.desktop} $pkgdir/usr/share/applications/
+ install -m644 $srcdir/firefox/browser/icons/mozicon128.png $pkgdir/usr/share/pixmaps/$_pkgname.png
}
+
diff --git a/firefox-esr-safe.desktop b/firefox-esr-safe.desktop
new file mode 100644
index 000000000000..3cf9914787c7
--- /dev/null
+++ b/firefox-esr-safe.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=Firefox ESR - Safe Mode
+GenericName=Web Browser - Safe Mode
+Icon=firefox-esr
+Type=Application
+Categories=Application;Network;
+MimeType=text/html
+Encoding=UTF-8
+Exec=firefox-esr -safe-mode %u
+Terminal=false
+MultipleArgs=false
+StartupNotify=false
+StartupWMClass=Firefox
diff --git a/firefox-esr-zh-cn.desktop b/firefox-esr.desktop
index ff330479d69d..aa404bf13932 100644
--- a/firefox-esr-zh-cn.desktop
+++ b/firefox-esr.desktop
@@ -1,16 +1,16 @@
[Desktop Entry]
Name=Firefox ESR
GenericName=Web Browser
-Comment=Browse the World Wide Web
+Icon=firefox-esr
+Type=Application
+Categories=Application;Network;
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+Encoding=UTF-8
Exec=firefox-esr %u
Terminal=false
-Type=Application
-Icon=firefox-esr
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
+MultipleArgs=false
StartupNotify=false
StartupWMClass=Firefox
-Actions=NewTab;NewWindow;NewPrivateWindow;
[Desktop Action NewTab]
Name=打开新标签页
diff --git a/firefox-esr-zh-cn.install b/firefox-esr.install
index 02961053554f..02961053554f 100644
--- a/firefox-esr-zh-cn.install
+++ b/firefox-esr.install