v2020.11.25

3 files changed, 64 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e3dcb2607644..bea762845063 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,15 @@
 pkgbase = serpent-browser
 	pkgdesc = Unbranded version of Basilisk web browser
-	pkgver = 2020.06.10
+	pkgver = 2020.11.25
 	pkgrel = 1
 	url = https://www.basilisk-browser.org/
 	arch = x86_64
+	arch = i686
+	arch = pentium4
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
 	license = MPL
 	license = GPL
 	license = LGPL
@@ -15,14 +21,12 @@ pkgbase = serpent-browser
 	makedepends = autoconf2.13
 	depends = gtk2
 	depends = gtk3
-	depends = dbus-glib
 	depends = libxt
-	depends = mime-types
+	depends = mailcap
 	depends = nss
 	depends = alsa-lib
 	depends = icu
 	depends = ttf-font
-	depends = dbus
 	depends = libpulse
 	optdepends = hunspell: spell checker and morphological analyzer
 	optdepends = hyphen: library for hyphenation and justification
@@ -31,12 +35,12 @@ pkgbase = serpent-browser
 	conflicts = basilisk
 	options = !emptydirs
 	options = !makeflags
-	source = https://github.com/MoonchildProductions/Basilisk/archive/v2020.06.10.tar.gz
-	source = https://github.com/MoonchildProductions/UXP/archive/8797b20746cd80c51cc56225f70ddea6c6b94f9d.tar.gz
-	source = https://raw.githubusercontent.com/MoonchildProductions/Pale-Moon/1f08c80172805b68ac36dd368a36f1e6828fc662/palemoon/branding/official/palemoon.desktop
-	sha256sums = 95bf84ed387e1fd57d6008e4eb18d9359b0c647c523722942d9faf897d67c11d
-	sha256sums = cd22f27ec1f2dfadafd2c512268ab8f437504a432c9a32adf491945b09d6c1c9
-	sha256sums = 98fce6e155a0c0243886b09364ab925d742cdc97d631bfd1019a2c597aed42fc
+	source = serpent-browser::git+https://repo.palemoon.org/MoonchildProductions/Basilisk.git#tag=v2020.11.25
+	source = serpent-browser.desktop
+	source = git+https://repo.palemoon.org/MoonchildProductions/UXP.git
+	sha256sums = SKIP
+	sha256sums = ba1502352e069f6945519228ef776e4c2eadaf5165132ec9edcbe71135b7c848
+	sha256sums = SKIP
 
 pkgname = serpent-browser
 
diff --git a/PKGBUILD b/PKGBUILD
index aafa9c202b47..cd0ef3b27d25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,38 @@
+# Maintainer: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix
 # Contributor: neeshy <neeshy@tfwno.gf>
 # Contributor: Charadon <dev at iotib dot net>
 # Contributor: Frederic Bezies <fredbezies at gmail dot com>
+
 pkgname=serpent-browser
-pkgver=2020.06.10
+pkgver=2020.11.25
 pkgrel=1
 pkgdesc="Unbranded version of Basilisk web browser"
-arch=('x86_64')
+arch=(x86_64 i686 pentium4 arm armv6h armv7h aarch64)
 url="https://www.basilisk-browser.org/"
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'gtk3' 'libxt' 'mime-types' 'nss' 'alsa-lib' 'icu' 'ttf-font' 'libpulse')
-makedepends=('unzip' 'zip' 'python2' 'yasm' 'mesa' 'autoconf2.13')
+license=(MPL GPL LGPL)
+depends=(gtk2 gtk3 libxt mailcap nss alsa-lib icu ttf-font libpulse)
+makedepends=(unzip zip python2 yasm mesa autoconf2.13)
 optdepends=('hunspell: spell checker and morphological analyzer'
             'hyphen: library for hyphenation and justification'
             'ffmpeg: record, convert, and stream audio and video')
-provides=('basilisk')
-conflicts=('basilisk')
+provides=(basilisk)
+conflicts=(basilisk)
 options=(!emptydirs !makeflags)
-_commit=8797b20746cd80c51cc56225f70ddea6c6b94f9d
-source=("https://github.com/MoonchildProductions/Basilisk/archive/v$pkgver.tar.gz"
-        "https://github.com/MoonchildProductions/UXP/archive/$_commit.tar.gz"
-        "https://raw.githubusercontent.com/MoonchildProductions/Pale-Moon/1f08c80172805b68ac36dd368a36f1e6828fc662/palemoon/branding/official/palemoon.desktop")
-sha256sums=('95bf84ed387e1fd57d6008e4eb18d9359b0c647c523722942d9faf897d67c11d'
-            'cd22f27ec1f2dfadafd2c512268ab8f437504a432c9a32adf491945b09d6c1c9'
-            '98fce6e155a0c0243886b09364ab925d742cdc97d631bfd1019a2c597aed42fc')
+
+source=("${pkgname%-git}::git+https://repo.palemoon.org/MoonchildProductions/Basilisk.git#tag=v${pkgver}"
+        serpent-browser.desktop
+        "git+https://repo.palemoon.org/MoonchildProductions/UXP.git")
+sha256sums=('SKIP'
+            'ba1502352e069f6945519228ef776e4c2eadaf5165132ec9edcbe71135b7c848'
+            'SKIP')
 
 prepare() {
-  cd "$srcdir/Basilisk-$pkgver"
+  cd "${srcdir}/${pkgname%-git}"
+
+  git submodule init
+  git config 'submodule.platform.url' "${srcdir}/UXP"
+  git submodule update
 
-  mv -T "$srcdir/UXP-$_commit" platform
-  ln -s serpent browser
 
   cat > .mozconfig << EOF
 mk_add_options AUTOCLOBBER=1
@@ -61,13 +65,13 @@ EOF
 }
 
 build() {
-  cd "$srcdir/Basilisk-$pkgver"
+  cd "${srcdir}/${pkgname%-git}"
 
   make -f client.mk build
 }
 
 package() {
-  cd "$srcdir/Basilisk-$pkgver"
+  cd "${srcdir}/${pkgname%-git}"
 
   make -f client.mk DESTDIR="$pkgdir" install
 
@@ -85,16 +89,8 @@ package() {
   install -Dm644 basilisk/branding/unofficial/content/about-logo@2x.png \
     "$pkgdir/usr/share/icons/hicolor/384x384/apps/basilisk.png"
 
-  install -Dm644 "$srcdir/palemoon.desktop" \
-    "$pkgdir/usr/share/applications/serpent.desktop"
-  sed -i -e "s:Pale Moon:Serpent:" -e "s:palemoon:basilisk:" \
-    -e "s@https://start.palemoon.org@about:newtab@" \
-    "$pkgdir/usr/share/applications/serpent.desktop"
-
-  # Use system-provided dictionaries
-  rm -rf "$pkgdir"/usr/local/lib/basilisk/{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/basilisk-52.9.0/dictionaries"
-  ln -s /usr/share/hyphen "$pkgdir/usr/lib/basilisk-52.9.0/hyphenation"
+  install -Dm644 "$srcdir/serpent-browser.desktop" \
+    "$pkgdir/usr/share/applications/serpent-browser.desktop"
 
   # Replace duplicate binary with symlink
   # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
diff --git a/serpent-browser.desktop b/serpent-browser.desktop
new file mode 100644
index 000000000000..89d17c459bf9
--- /dev/null
+++ b/serpent-browser.desktop
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Name=Serpent Browser
+GenericName=Web Browser
+Comment=Browse the World Wide Web
+Exec=basilisk %u
+Terminal=false
+Type=Application
+Icon=basilisk
+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;
+StartupNotify=false
+Actions=NewTab;NewWindow;NewPrivateWindow;
+StartupWMClass="browser"
+
+[Desktop Action NewTab]
+Name=Open new tab
+Exec=basilisk -new-tab
+
+[Desktop Action NewWindow]
+Name=Open new window
+Exec=basilisk -new-window
+
+[Desktop Action NewPrivateWindow]
+Name=New private window
+Exec=basilisk -private-window