Update for new upstream packaging

4 files changed, 33 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2581108f9537..5bd3b4fc5441 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,31 @@
 pkgbase = brave-dev-bin
 	pkgdesc = Web browser that blocks ads and trackers by default (dev binary release).
-	pkgver = 1.15.56
-	pkgrel = 1
+	pkgver = 1.15.65
+	pkgrel = 2
 	url = https://brave.com/download-dev
 	arch = x86_64
-	license = custom
+	license = MPL2
 	depends = gtk3
 	depends = nss
 	depends = alsa-lib
 	depends = libxss
+	depends = libgnome-keyring
 	depends = ttf-font
 	optdepends = cups: Printer support
 	optdepends = pepper-flash: Adobe Flash support
-	optdepends = libgnome-keyring: gnome keyring support
 	optdepends = mesa: Hardware accelerated rendering
 	optdepends = libglvnd: Support multiple different OpenGL drivers at any given time
 	provides = brave-dev-bin
 	provides = brave-dev-browser
 	conflicts = brave-dev-bin
 	conflicts = brave-bin
-	noextract = brave-dev-bin-1.15.56.zip
 	options = !strip
-	source = brave-dev-bin-1.15.56.zip::https://github.com/brave/brave-browser/releases/download/v1.15.56/brave-v1.15.56-linux-x64.zip
+	source = https://github.com/brave/brave-browser/releases/download/v1.15.65/brave-browser-dev_1.15.65_amd64.deb
 	source = MPL2::https://raw.githubusercontent.com/brave/browser-laptop/master/LICENSE.txt
 	source = brave-dev-bin.sh
-	source = brave-dev-bin.desktop
-	source = braveAbout.png
-	sha512sums = e21868ee9530d11c89d1fb3b9f6bb3c7deafd2eb9886f1a3ab763ef0912dec571dbd904724f77becdaecfcca5cbef12c462d24792c24067e42e197a99070018b
+	sha512sums = 3eda9da0c5ccc3e4d987bdfffbf853db3bc7329082bfd28b643e89286caae3c9e2b114d29ca656e24e105f2b21ac2ecb70673c416228ecaa45b2ca0897a86a30
 	sha512sums = b8823586fead21247c8208bd842fb5cd32d4cb3ca2a02339ce2baf2c9cb938dfcb8eb7b24c95225ae625cd0ee59fbbd8293393f3ed1a4b45d13ba3f9f62a791f
-	sha512sums = 128ceca4c95aa9beb9f6b6b7da3fbc01d01f24d61de0e3fc07297c53f90dd117300f31d4e1d1dfab471b121d31222f01390540d75c4529b99b9b9a2ee7192a1a
-	sha512sums = b71da6c9d587294a015fdb417e3483bcad768be9c82224051980621963ddc314a235208dab1c4d3e71a8894972d1cf2f86f598d4b9953d8a9e85406066d75caa
-	sha512sums = 5caba107bd958a4387b35f144d695c4f63e9c1bb874c906a1d141efba403d2e2c4b30d756630afc2567089fdbfef7abadba6fa5becf63cffa6dce16bfd50cd47
+	sha512sums = a133f9ea4bd1f50f375a6039187fa886c380d77f1e47528f8350e1f9fbc6e1e7a1c8baaa40f6126c32ad3b9df57c456374564d1e7d7cd4c027b5ff2e96aa358e
 
 pkgname = brave-dev-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 7f520a83c8bb..f668a5bb4553 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,44 @@
-# Contributor: Greg White <gwhite@kupulaucom>
-# Maintainer: Greg White <gwhite@kupulaucom>
+# Contributor: Greg White <gwhite@kupulau.com>
+# Maintainer: Greg White <gwhite@kupulau.com>
 
 pkgname=brave-dev-bin
-pkgver=1.15.56
-pkgrel=1
+pkgver=1.15.65
+pkgrel=2
 pkgdesc='Web browser that blocks ads and trackers by default (dev binary release).'
-chrome_version=86.0.4240.22
 arch=('x86_64')
 url='https://brave.com/download-dev'
-license=('custom')
-depends=('gtk3' 'nss' 'alsa-lib' 'libxss' 'ttf-font')
+license=('MPL2')
+depends=('gtk3' 'nss' 'alsa-lib' 'libxss' 'libgnome-keyring' 'ttf-font')
 optdepends=('cups: Printer support'
             'pepper-flash: Adobe Flash support'
-	    'libgnome-keyring: gnome keyring support'
-	    'mesa: Hardware accelerated rendering'
-	    'libglvnd: Support multiple different OpenGL drivers at any given time')
+            'mesa: Hardware accelerated rendering'
+            'libglvnd: Support multiple different OpenGL drivers at any given time')
 provides=("${pkgname}" 'brave-dev-browser')
 conflicts=("${pkgname}" 'brave-bin')
-source=("$pkgname-$pkgver.zip::https://github.com/brave/brave-browser/releases/download/v${pkgver}/brave-v${pkgver}-linux-x64.zip"
+source=("https://github.com/brave/brave-browser/releases/download/v${pkgver}/brave-browser-dev_${pkgver}_amd64.deb"
         'MPL2::https://raw.githubusercontent.com/brave/browser-laptop/master/LICENSE.txt'
-        "$pkgname.sh"
-        "$pkgname.desktop"
-        "braveAbout.png")
+        "$pkgname.sh")
 options=(!strip)
-sha512sums=('e21868ee9530d11c89d1fb3b9f6bb3c7deafd2eb9886f1a3ab763ef0912dec571dbd904724f77becdaecfcca5cbef12c462d24792c24067e42e197a99070018b'
+sha512sums=('3eda9da0c5ccc3e4d987bdfffbf853db3bc7329082bfd28b643e89286caae3c9e2b114d29ca656e24e105f2b21ac2ecb70673c416228ecaa45b2ca0897a86a30'
             'b8823586fead21247c8208bd842fb5cd32d4cb3ca2a02339ce2baf2c9cb938dfcb8eb7b24c95225ae625cd0ee59fbbd8293393f3ed1a4b45d13ba3f9f62a791f'
-            '128ceca4c95aa9beb9f6b6b7da3fbc01d01f24d61de0e3fc07297c53f90dd117300f31d4e1d1dfab471b121d31222f01390540d75c4529b99b9b9a2ee7192a1a'
-            'b71da6c9d587294a015fdb417e3483bcad768be9c82224051980621963ddc314a235208dab1c4d3e71a8894972d1cf2f86f598d4b9953d8a9e85406066d75caa'
-            '5caba107bd958a4387b35f144d695c4f63e9c1bb874c906a1d141efba403d2e2c4b30d756630afc2567089fdbfef7abadba6fa5becf63cffa6dce16bfd50cd47')
-noextract=("$pkgname-$pkgver.zip")
+            'a133f9ea4bd1f50f375a6039187fa886c380d77f1e47528f8350e1f9fbc6e1e7a1c8baaa40f6126c32ad3b9df57c456374564d1e7d7cd4c027b5ff2e96aa358e')
 
 prepare() {
   mkdir -p brave
-  cat $pkgname-$pkgver.zip | bsdtar -xf- -C brave
-  chmod +x brave/brave
+  tar xf data.tar.xz -C brave
+  # Delete unneeded cron job
+  rm -rf brave/opt/brave.com/brave-dev/cron
+  find brave
+  # Use our script to launch (allows overriding flags, sets up data dir)
+  sed -i "s/\/usr\/bin\/brave-browser-dev/\/usr\/bin\/brave-dev/g" brave/usr/share/applications/brave-browser-dev.desktop    
 }
 
-_bsdtardir="brave"
-
 package() {
-    install -d -m0755 "$pkgdir/usr/lib"
-    cp -a --reflink=auto $_bsdtardir "$pkgdir/usr/lib/$pkgname"
-
+    cp -a --reflink=auto brave/opt "$pkgdir/opt"
+    cp -a --reflink=auto brave/usr "$pkgdir/usr"
+    
     install -Dm0755 "$pkgname.sh" "$pkgdir/usr/bin/brave-dev"
-    install -Dm0644 -t "$pkgdir/usr/share/applications" "$pkgname.desktop"
-    install -Dm0644 "braveAbout.png" "$pkgdir/usr/share/pixmaps/brave-dev.png"
-    install -Dm0664 -t "$pkgdir/usr/share/licenses/$pkgname" "MPL2"
-#    mv "$pkgdir/usr/lib/$pkgname/"{LICENSE,LICENSES.chromium.html} "$pkgdir/usr/share/licenses/$pkgname"
+    install -Dm0644 "brave/opt/brave.com/brave-dev/product_logo_128_dev.png" "$pkgdir/usr/share/pixmaps/brave-browser-dev.png"
 
-    ln -s /usr/lib/PepperFlash "$pkgdir/usr/lib/pepperflashplugin-nonfree"
+    install -Dm0664 -t "$pkgdir/usr/share/licenses/$pkgname" "brave/opt/brave.com/brave-dev/LICENSE"
 }
diff --git a/brave-dev-bin.sh b/brave-dev-bin.sh
index 6d092165303d..230b212446bd 100755
--- a/brave-dev-bin.sh
+++ b/brave-dev-bin.sh
@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 
-if [ -z "$BRAVE_FLAGS" ]; then
-    if [[ ! (-r /proc/sys/kernel/unprivileged_userns_clone && $(< /proc/sys/kernel/unprivileged_userns_clone) == 1 && -n $(zcat /proc/config.gz | grep CONFIG_USER_NS=y) ) ]]; then
-        >&2 echo "User namespaces are not detected as enabled on your system, brave will run with the sandbox disabled"
-        FLAG="--no-sandbox"
-    fi
+if [[ -z "${CHROME_USER_DATA_DIR}" ]]; then
+    export CHROME_USER_DATA_DIR=~/.config/BraveSoftware/Brave-Browser-Dev
 fi
-exec "/usr/lib/brave-dev-bin/brave" "--use-gl=desktop" "$BRAVE_FLAGS" "$FLAG" -- "$@"
+exec "/opt/brave.com/brave-dev/brave-browser" "$BRAVE_FLAGS" "$FLAG" "$@"
diff --git a/braveAbout.png b/braveAbout.png
deleted file mode 100644
index 5994e401c7f4..000000000000
--- a/braveAbout.png
+++ /dev/null