121.0.1

4 files changed, 126 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05fd9ca6fd6f..59d8f81e498c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,27 @@
 pkgbase = mercury-browser-bin
 	pkgdesc = Compiler optimized, private Firefox fork
-	pkgver = 115.4.0
-	pkgrel = 5
+	pkgver = 121.0.1
+	pkgrel = 1
 	url = https://github.com/Alex313031/Mercury
 	install = mercury-browser.install
 	arch = x86_64
-	license = MPL
-	license = GPL
-	license = LGPL
+	license = MPL-2.0
 	optdepends = ffmpeg: H264/AAC/MP3 decoding
 	optdepends = hunspell: Spell checking
 	optdepends = hyphen: Hyphenation
 	optdepends = networkmanager: Location detection via available WiFi networks
-	optdepends = pulseaudio: Sound
-	optdepends = upower: Battery API
-	noextract = mercury-browser_115.4.0_amd64.deb
+	noextract = mercury-browser_121.0.1_amd64.deb
 	options = !emptydirs
 	options = !strip
-	source = mercury-browser_115.4.0_amd64.deb::https://github.com/Alex313031/Mercury/releases/download/v.115.4.0/mercury-browser_115.4.0_amd64.deb
+	source = mercury-browser_121.0.1_amd64.deb::https://github.com/Alex313031/Mercury/releases/download/v.121.0.1/mercury-browser_121.0.1_amd64.deb
 	source = mercury-browser.sh
 	sha256sums = SKIP
 	sha256sums = 7565aa160be433bcc030c2fc14627ce12c91fbb953d8ba8af8185ccd356022f5
 
 pkgname = mercury-browser-bin
+	depends = alsa-lib
 	depends = dbus-glib
 	depends = gtk3
 	depends = libnotify
-	depends = libxt
-	depends = nss
-	provides = mercury-browser=115.4.0
+	provides = mercury-browser=121.0.1
 	conflicts = mercury-browser
diff --git a/PKGBUILD b/PKGBUILD
index f165821fa422..dce86dbeb6fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,22 @@
 # Contributor: Alexey Peschany <archlinux at sandboiii dot xyz>
 
 # options
-if [ -z "$_srcinfo" ] ; then
+if [ -n "$_srcinfo" ] || [ -n "$_pkgver" ] ; then
   : ${_autoupdate:=false}
-elif [ -z "$_pkgver" ] ; then
-  : ${_autoupdate:=true}
 else
-  : ${_autoupdate:=false}
+  : ${_autoupdate:=true}
 fi
 
-: ${_pkgver:=115.4.0}
-
-: ${_pkgtype:=bin}
+: ${_pkgtype:=-bin}
 
 # basic info
 _pkgname="mercury-browser"
-pkgname="$_pkgname${_pkgtype:+-$_pkgtype}"
-pkgver=115.4.0
-pkgrel=5
+pkgname="$_pkgname${_pkgtype:-}"
+pkgver=121.0.1
+pkgrel=1
 pkgdesc="Compiler optimized, private Firefox fork"
 url="https://github.com/Alex313031/Mercury"
-license=('MPL' 'GPL' 'LGPL')
+license=('MPL-2.0')
 arch=('x86_64')
 
 # main package
@@ -33,15 +29,13 @@ _main_package() {
     'hunspell: Spell checking'
     'hyphen: Hyphenation'
     'networkmanager: Location detection via available WiFi networks'
-    'pulseaudio: Sound'
-    'upower: Battery API'
   )
 
   options=('!emptydirs' '!strip')
   install="$_pkgname.install"
 
   : ${_dl_filename:=${_pkgname}_${_pkgver:?}_amd64.deb}
-  : ${_dl_url:=$url/releases/download/v.$pkgver/$_dl_filename}
+  : ${_dl_url:=$url/releases/download/v.$_pkgver/$_dl_filename}
 
   noextract+=("$_dl_filename")
   source=(
@@ -65,28 +59,50 @@ package() {
   conflicts=("$_pkgname")
 
   depends+=(
+    'alsa-lib'
     'dbus-glib'
     'gtk3'
     'libnotify' # notify-send
-    'libxt'
-    'nss'
-  )
 
-  # extract archive
-  bsdtar -xf "$_dl_filename" data.tar.gz
-  bsdtar -xf data.tar.gz -C "${pkgdir:?}/"
-  rm data.tar.gz
+    ## implicit
+    #at-spi2-core
+    #cairo
+    #dbus
+    #fontconfig
+    #freetype2
+    #gcc-libs
+    #gdk-pixbuf2
+    #glib2
+    #glibc
+    #libx11
+    #libxcb
+    #libxcomposite
+    #libxcursor
+    #libxdamage
+    #libxext
+    #libxfixes
+    #libxi
+    #libxrandr
+    #libxrender
+    #pango
+  )
 
-  # move and copy files into position
-  install -Dm755 "$_pkgname.sh" "${pkgdir:?}/usr/bin/$_pkgname"
+  local _filetype="zip"
+  if bsdtar -xf "$_dl_filename" -- data.tar.* &> /dev/null ; then
+    _filetype="deb"
+  fi
 
-  install -dm755 "${pkgdir:?}/opt/$_pkgname"
-  mv "${pkgdir:?}/usr/lib/mercury"/* "${pkgdir:?}/opt/$_pkgname/"
+  if [[ "${_filetype::1}" == 'z' ]] ; then
+    _package_zip
+  else
+    _package_deb
+  fi
 
-  install -Dm644 "${pkgdir:?}/usr/share/doc/mercury-browser/copyright" "${pkgdir:?}/usr/share/licenses/$pkgname/LICENSE"
+  # script
+  install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
 
   # fix permissions
-  chmod -R u+rwX,go+rX,go-w "${pkgdir:?}/"
+  chmod -R u+rwX,go+rX,go-w "$pkgdir/"
 
   # remove unnecessary folders
   \rm -rf "${pkgdir:?}/usr/lib/"
@@ -94,34 +110,83 @@ package() {
   \rm -rf "${pkgdir:?}/usr/share/lintian/"
 }
 
+_package_deb() {
+  # extract archive
+  bsdtar -xf "$_dl_filename" data.tar.*
+  bsdtar -xf data.tar.gz -C "$pkgdir/"
+  rm data.tar.gz
+
+  # move files from /lib to /opt
+  install -dm755 "$pkgdir/opt/$_pkgname"
+  mv "$pkgdir/usr/lib/mercury"/* "$pkgdir/opt/$_pkgname/"
+}
+
+_package_zip() {
+  local _depth=$(
+    bsdtar -tf "$_dl_filename" -- */mercury/mercury$ \
+      | tr -cd '/' | wc -c
+  )
+
+  # extract archive
+  install -dm755 "$pkgdir/opt/$_pkgname"
+  bsdtar --strip-components="$_depth" -C "$pkgdir/opt/$_pkgname/" -xf "$_dl_filename" '*/mercury/*'
+
+  # icon
+  install -Dm644 "$pkgdir/opt/$_pkgname/browser/chrome/icons/default/default128.png" -t "$pkgdir/usr/share/pixmaps/"
+
+  # desktop
+  install -Dvm644 /dev/stdin "$pkgdir/usr/share/applications/mercury-browser.desktop" <<END
+[Desktop Entry]
+Version=1.0
+Name=Mercury
+Comment=Browse the World Wide Web
+GenericName=Web Browser
+Keywords=Internet;WWW;Browser;Web;Explorer;Mercury
+Exec=mercury-browser %u
+StartupWMClass=mercury
+Terminal=false
+X-MultipleArgs=true
+Type=Application
+Icon=mercury
+Categories=GNOME;GTK;Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
+StartupNotify=true
+Actions=NewWindow;NewPrivateWindow;TempUserDir;
+
+[Desktop Action NewWindow]
+Name=New Window
+Exec=mercury-browser -new-window
+
+[Desktop Action NewPrivateWindow]
+Name=New Private Window
+Exec=mercury-browser -private-window
+
+[Desktop Action TempUserDir]
+Name=Open With Temporary User Profile
+Exec=mercury-browser --temp-profile
+END
+}
+
 # update version
 _update_version() {
-  if [ x"${_autoupdate::1}" != "xt" ] ; then
+  : ${_pkgver:=${pkgver%%.r*}}
+
+  if [[ "${_autoupdate::1}" != "t" ]] ; then
     return
   fi
 
-  _response=$(curl "https://api.github.com/repos/${url#*.com/}/releases" -s)
-
-  _get() {
+  local _response=$(curl -Ssf "$url/releases.atom")
+  local _tag=$(
     printf '%s' "$_response" \
-      | awk -F '"' '/"'"$1"'":/{print $4}' \
-      | grep -E '_amd64\.deb' \
-      | head -1 | sed 's/^v//'
-  }
-
-  _dl_url=$(_get browser_download_url)
-  _dl_filename="${_dl_url##*/}"
-
-  _regex='^.*mercury-browser_([0-9\.]+)_.*\.deb.*$'
-  _pkgver_new=$(
-    printf '%s' "$_dl_url" \
-      | grep -E "$_regex" | head -1 | sed -E "s@$_regex@\1@"
+      | grep '/releases/tag/' \
+      | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \
+      | grep -Ev '[a-z]{2}' | sort -V | tail -1
   )
+  local _pkgver_new="${_tag#v.}"
 
   # update _pkgver
-  if [ x"$_pkgver" != x"${_pkgver_new:?}" ] ; then
-    _pkgver="$_pkgver_new"
-    sed -Ei "s@^(\s*: \\\$\{_pkgver):=.*\}\$@\1:=${_pkgver:?}}@" "$startdir/PKGBUILD"
+  if [ "$_pkgver" != "${_pkgver_new:?}" ] ; then
+    _pkgver="${_pkgver_new:?}"
   fi
 }
 
diff --git a/mercury-browser.desktop b/mercury-browser.desktop
deleted file mode 100644
index 184d71cd9e78..000000000000
--- a/mercury-browser.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Mercury Browser
-GenericName=Web Browser
-Comment=The fastest Firefox fork on Earth
-Exec=mercury-browser %u
-Icon=mercury-browser
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-StartupWMClass=Mercury Browser
-Categories=Network;WebBrowser;
-Keywords=web;browser;internet;
diff --git a/mercury-browser.install b/mercury-browser.install
index 1b41a68c0550..1c810c1625a1 100644
--- a/mercury-browser.install
+++ b/mercury-browser.install
@@ -3,10 +3,14 @@ msg_blue() {
   printf "${BLUE}==>${BOLD} $1${ALL_OFF}\n"
 }
 
-note() {
+note1() {
   printf "${BLUE}==>${YELLOW} NOTE:${BOLD} $1${ALL_OFF}\n"
 }
 
+note2() {
+  printf "${BLUE}==>      ${BOLD} $1${ALL_OFF}\n"
+}
+
 ALL_OFF="$(tput sgr0)"
 BOLD="${ALL_OFF}$(tput bold)"
 BLACK="${BOLD}$(tput setaf 0)"
@@ -20,10 +24,10 @@ WHITE="${BOLD}$(tput setaf 7)"
 
 post_install() {
   if /usr/lib/ld-linux-x86-64.so.2 --help | grep -qsE '^\s+x86-64-v3.*supported.*$' ; then
-    note "Enjoy the fastest Firefox fork on Earth: mercury-browser"
+    note1 "Enjoy the fastest Firefox fork on Earth: mercury-browser"
   else
-    note "Your processor does not support x86-64-v3."
-    note "mercury-browser may not work on your computer."
+    note1 "Your processor does not support x86-64-v3."
+    note2 "mercury-browser may not work on your computer."
   fi
 }