Re: [PR PATCH] [Updated] [WIP] New package: brave-1.2.41-x64

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 391 bytes --]

There is an updated pull request by TheGejr against master on the void-packages repository

https://github.com/TheGejr/void-packages brave
https://github.com/void-linux/void-packages/pull/18586

[WIP] New package: brave-1.2.41-x64
This package provides the open source web browser based on chromium.

A patch file from https://github.com/void-linux/void-packages/pull/18586.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-brave-18586.patch --]
[-- Type: text/x-diff, Size: 14738 bytes --]

From 8dd742a16344bf6b6ff7e0436638cbbc022f2e83 Mon Sep 17 00:00:00 2001
From: Malte Gejr <maltegejr.korup@gmail.com>
Date: Mon, 27 Jan 2020 17:06:36 +0100
Subject: [PATCH 1/2] New package: brave-1.2.41-x64

---
 srcpkgs/brave/INSTALL             |  30 ++++
 srcpkgs/brave/REMOVE              |   6 +
 srcpkgs/brave/files/brave.desktop | 221 ++++++++++++++++++++++++++++++
 srcpkgs/brave/template            |  22 +++
 4 files changed, 279 insertions(+)
 create mode 100644 srcpkgs/brave/INSTALL
 create mode 100644 srcpkgs/brave/REMOVE
 create mode 100755 srcpkgs/brave/files/brave.desktop
 create mode 100644 srcpkgs/brave/template

diff --git a/srcpkgs/brave/INSTALL b/srcpkgs/brave/INSTALL
new file mode 100644
index 00000000000..590d72d379b
--- /dev/null
+++ b/srcpkgs/brave/INSTALL
@@ -0,0 +1,30 @@
+# INSTALL for 'brave'
+# Fetching github release at install-time
+
+_BUILDDIR="/tmp/brave.build"
+
+if test "$ACTION" = "post"; then
+	. /usr/share/brave/pkgdata
+	mkdir -p "$_BUILDDIR"
+	(
+		set -e
+		cd "$_BUILDDIR"
+		xbps-uhelper fetch "https://github.com/brave/brave-browser/releases/download/v${SVERSION}/brave-v${SVERSION}-linux-${SARCH}.zip"
+		echo "${SCHECKSUM}  brave-v${SVERSION}-linux-${SARCH}.zip" >checksum
+		sha256sum -c checksum
+		unzip -q "brave-v${SVERSION}-linux-${SARCH}.zip"
+		rm "brave-v${SVERSION}-linux-${SARCH}.zip"
+	)
+	if [ $? -ne 0 ] ; then
+		echo "Failed downloading brave"
+		rm -r "$_BUILDDIR";
+		exit 1;
+	fi
+
+	mkdir -p /usr/share/brave
+	cp -r ${_BUILDDIR}/* /usr/share/brave/
+	ln -sf "/usr/share/brave/brave" /bin/
+	ln -sf "/usr/share/brave/brave.desktop" /usr/share/applications/
+	rm -r $_BUILDDIR
+fi
+
diff --git a/srcpkgs/brave/REMOVE b/srcpkgs/brave/REMOVE
new file mode 100644
index 00000000000..5f0deec01e9
--- /dev/null
+++ b/srcpkgs/brave/REMOVE
@@ -0,0 +1,6 @@
+# REMOVE for 'brave'
+# Deleting dynamically fetched files
+
+if test "$ACTION" = "post"; then
+	rm -r /usr/share/brave
+fi
diff --git a/srcpkgs/brave/files/brave.desktop b/srcpkgs/brave/files/brave.desktop
new file mode 100755
index 00000000000..87c7ce492cf
--- /dev/null
+++ b/srcpkgs/brave/files/brave.desktop
@@ -0,0 +1,221 @@
+[Desktop Entry]
+Version=1.0
+Name=Brave Web Browser
+# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
+# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
+GenericName=Web Browser
+GenericName[ar]=متصفح الشبكة
+GenericName[bg]=Уеб браузър
+GenericName[ca]=Navegador web
+GenericName[cs]=WWW prohlížeč
+GenericName[da]=Browser
+GenericName[de]=Web-Browser
+GenericName[el]=Περιηγητής ιστού
+GenericName[en_GB]=Web Browser
+GenericName[es]=Navegador web
+GenericName[et]=Veebibrauser
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
+GenericName[gu]=વેબ બ્રાઉઝર
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブブラウザ
+GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
+GenericName[ko]=웹 브라우저
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Tīmekļa pārlūks
+GenericName[ml]=വെബ് ബ്രൌസര്‍
+GenericName[mr]=वेब ब्राऊजर
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador da Internet
+GenericName[ro]=Navigator de Internet
+GenericName[ru]=Веб-браузер
+GenericName[sl]=Spletni brskalnik
+GenericName[sv]=Webbläsare
+GenericName[ta]=இணைய உலாவி
+GenericName[th]=เว็บเบราว์เซอร์
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Навігатор Тенет
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_HK]=網頁瀏覽器
+GenericName[zh_TW]=網頁瀏覽器
+# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[fil]=Web Browser
+GenericName[hr]=Web preglednik
+GenericName[id]=Browser Web
+GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
+GenericName[sk]=WWW prehliadač
+GenericName[sr]=Интернет прегледник
+GenericName[te]=మహాతల అన్వేషి
+GenericName[vi]=Bộ duyệt Web
+# Gnome and KDE 3 uses Comment.
+Comment=Access the Internet
+Comment[ar]=الدخول إلى الإنترنت
+Comment[bg]=Достъп до интернет
+Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
+Comment[ca]=Accedeix a Internet
+Comment[cs]=Přístup k internetu
+Comment[da]=Få adgang til internettet
+Comment[de]=Internetzugriff
+Comment[el]=Πρόσβαση στο Διαδίκτυο
+Comment[en_GB]=Access the Internet
+Comment[es]=Accede a Internet.
+Comment[et]=Pääs Internetti
+Comment[fi]=Käytä internetiä
+Comment[fil]=I-access ang Internet
+Comment[fr]=Accéder à Internet
+Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
+Comment[he]=גישה אל האינטרנט
+Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
+Comment[hr]=Pristup Internetu
+Comment[hu]=Internetelérés
+Comment[id]=Akses Internet
+Comment[it]=Accesso a Internet
+Comment[ja]=インターネットにアクセス
+Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
+Comment[ko]=인터넷 연결
+Comment[lt]=Interneto prieiga
+Comment[lv]=Piekļūt internetam
+Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യുക
+Comment[mr]=इंटरनेटमध्ये प्रवेश करा
+Comment[nb]=Gå til Internett
+Comment[nl]=Verbinding maken met internet
+Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
+Comment[pl]=Skorzystaj z internetu
+Comment[pt]=Aceder à Internet
+Comment[pt_BR]=Acessar a internet
+Comment[ro]=Accesaţi Internetul
+Comment[ru]=Доступ в Интернет
+Comment[sk]=Prístup do siete Internet
+Comment[sl]=Dostop do interneta
+Comment[sr]=Приступите Интернету
+Comment[sv]=Gå ut på Internet
+Comment[ta]=இணையத்தை அணுகுதல்
+Comment[te]=ఇంటర్నెట్‌ను ఆక్సెస్ చెయ్యండి
+Comment[th]=เข้าถึงอินเทอร์เน็ต
+Comment[tr]=İnternet'e erişin
+Comment[uk]=Доступ до Інтернету
+Comment[vi]=Truy cập Internet
+Comment[zh_CN]=访问互联网
+Comment[zh_HK]=連線到網際網路
+Comment[zh_TW]=連線到網際網路
+Exec=brave %u
+StartupNotify=true
+Terminal=false
+Icon=brave-browser
+Type=Application
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
+Actions=new-window;new-private-window;
+
+[Desktop Action new-window]
+Name=New Window
+Name[am]=አዲስ መስኮት
+Name[ar]=نافذة جديدة
+Name[bg]=Нов прозорец
+Name[bn]=নতুন উইন্ডো
+Name[ca]=Finestra nova
+Name[cs]=Nové okno
+Name[da]=Nyt vindue
+Name[de]=Neues Fenster
+Name[el]=Νέο Παράθυρο
+Name[en_GB]=New Window
+Name[es]=Nueva ventana
+Name[et]=Uus aken
+Name[fa]=پنجره جدید
+Name[fi]=Uusi ikkuna
+Name[fil]=New Window
+Name[fr]=Nouvelle fenêtre
+Name[gu]=નવી વિંડો
+Name[hi]=नई विंडो
+Name[hr]=Novi prozor
+Name[hu]=Új ablak
+Name[id]=Jendela Baru
+Name[it]=Nuova finestra
+Name[iw]=חלון חדש
+Name[ja]=新規ウインドウ
+Name[kn]=ಹೊಸ ವಿಂಡೊ
+Name[ko]=새 창
+Name[lt]=Naujas langas
+Name[lv]=Jauns logs
+Name[ml]=പുതിയ വിന്‍ഡോ
+Name[mr]=नवीन विंडो
+Name[nl]=Nieuw venster
+Name[no]=Nytt vindu
+Name[pl]=Nowe okno
+Name[pt]=Nova janela
+Name[pt_BR]=Nova janela
+Name[ro]=Fereastră nouă
+Name[ru]=Новое окно
+Name[sk]=Nové okno
+Name[sl]=Novo okno
+Name[sr]=Нови прозор
+Name[sv]=Nytt fönster
+Name[sw]=Dirisha Jipya
+Name[ta]=புதிய சாளரம்
+Name[te]=క్రొత్త విండో
+Name[th]=หน้าต่างใหม่
+Name[tr]=Yeni Pencere
+Name[uk]=Нове вікно
+Name[vi]=Cửa sổ Mới
+Name[zh_CN]=新建窗口
+Name[zh_TW]=開新視窗
+Exec=/usr/bin/brave-browser-stable
+
+[Desktop Action new-private-window]
+Name=New Incognito Window
+Name[ar]=نافذة جديدة للتصفح المتخفي
+Name[bg]=Нов прозорец „инкогнито“
+Name[bn]=নতুন ছদ্মবেশী উইন্ডো
+Name[ca]=Finestra d'incògnit nova
+Name[cs]=Nové anonymní okno
+Name[da]=Nyt inkognitovindue
+Name[de]=Neues Inkognito-Fenster
+Name[el]=Νέο παράθυρο για ανώνυμη περιήγηση
+Name[en_GB]=New Incognito window
+Name[es]=Nueva ventana de incógnito
+Name[et]=Uus inkognito aken
+Name[fa]=پنجره جدید حالت ناشناس
+Name[fi]=Uusi incognito-ikkuna
+Name[fil]=Bagong Incognito window
+Name[fr]=Nouvelle fenêtre de navigation privée
+Name[gu]=નવી છુપી વિંડો
+Name[hi]=नई गुप्त विंडो
+Name[hr]=Novi anoniman prozor
+Name[hu]=Új Inkognitóablak
+Name[id]=Jendela Penyamaran baru
+Name[it]=Nuova finestra di navigazione in incognito
+Name[iw]=חלון חדש לגלישה בסתר
+Name[ja]=新しいシークレット ウィンドウ
+Name[kn]=ಹೊಸ ಅಜ್ಞಾತ ವಿಂಡೋ
+Name[ko]=새 시크릿 창
+Name[lt]=Naujas inkognito langas
+Name[lv]=Jauns inkognito režīma logs
+Name[ml]=പുതിയ വേഷ പ്രച്ഛന്ന വിന്‍ഡോ
+Name[mr]=नवीन गुप्त विंडो
+Name[nl]=Nieuw incognitovenster
+Name[no]=Nytt inkognitovindu
+Name[pl]=Nowe okno incognito
+Name[pt]=Nova janela de navegação anónima
+Name[pt_BR]=Nova janela anônima
+Name[ro]=Fereastră nouă incognito
+Name[ru]=Новое окно в режиме инкогнито
+Name[sk]=Nové okno inkognito
+Name[sl]=Novo okno brez beleženja zgodovine
+Name[sr]=Нови прозор за прегледање без архивирања
+Name[sv]=Nytt inkognitofönster
+Name[ta]=புதிய மறைநிலைச் சாளரம்
+Name[te]=క్రొత్త అజ్ఞాత విండో
+Name[th]=หน้าต่างใหม่ที่ไม่ระบุตัวตน
+Name[tr]=Yeni Gizli pencere
+Name[uk]=Нове вікно в режимі анонімного перегляду
+Name[vi]=Cửa sổ ẩn danh mới
+Name[zh_CN]=新建隐身窗口
+Name[zh_TW]=新增無痕式視窗
+Exec=brave --incognito
diff --git a/srcpkgs/brave/template b/srcpkgs/brave/template
new file mode 100644
index 00000000000..6aa0873ded0
--- /dev/null
+++ b/srcpkgs/brave/template
@@ -0,0 +1,22 @@
+# Template file for 'brave'
+pkgname=brave
+version=1.2.41
+revision=1
+archs="x86_64"
+create_wrksrc=yes
+build_style=fetch
+makedepends="unzip"
+short_desc="Web browser that stops ads and trackers by default"
+maintainer="Malte Gejr <maltegejr.korup@gmail.com>"
+license="MPL-2.0"
+homepage="https://brave.com/"
+triggers="update-desktopdb"
+_sarch="x64"
+_schecksum="fe5228ab8fdc2d1d3e59e849b4cd3b9a60b6b8a3553011f33382eecb608e0cae"
+do_install() {
+	vmkdir /usr/share/brave
+	cp "${FILESDIR}/brave.desktop" "${DESTDIR}/usr/share/brave"
+	echo "export SVERSION=\"${version}\"" >"${DESTDIR}/usr/share/brave/pkgdata"
+	echo "export SARCH=\"${_sarch}\"" >>"${DESTDIR}/usr/share/brave/pkgdata"
+	echo "export SCHECKSUM=\"${_schecksum}\"" >>"${DESTDIR}/usr/share/brave/pkgdata"
+}

From 9b52d8880d962cfb59863a7d40d32e73c6801a9b Mon Sep 17 00:00:00 2001
From: Malte Gejr <maltegejr.korup@gmail.com>
Date: Mon, 27 Jan 2020 19:26:37 +0100
Subject: [PATCH 2/2] Moved all logic into template

---
 srcpkgs/brave/INSTALL  | 30 ------------------------------
 srcpkgs/brave/REMOVE   |  6 ------
 srcpkgs/brave/template | 14 +++++++-------
 3 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/brave/INSTALL
 delete mode 100644 srcpkgs/brave/REMOVE

diff --git a/srcpkgs/brave/INSTALL b/srcpkgs/brave/INSTALL
deleted file mode 100644
index 590d72d379b..00000000000
--- a/srcpkgs/brave/INSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-# INSTALL for 'brave'
-# Fetching github release at install-time
-
-_BUILDDIR="/tmp/brave.build"
-
-if test "$ACTION" = "post"; then
-	. /usr/share/brave/pkgdata
-	mkdir -p "$_BUILDDIR"
-	(
-		set -e
-		cd "$_BUILDDIR"
-		xbps-uhelper fetch "https://github.com/brave/brave-browser/releases/download/v${SVERSION}/brave-v${SVERSION}-linux-${SARCH}.zip"
-		echo "${SCHECKSUM}  brave-v${SVERSION}-linux-${SARCH}.zip" >checksum
-		sha256sum -c checksum
-		unzip -q "brave-v${SVERSION}-linux-${SARCH}.zip"
-		rm "brave-v${SVERSION}-linux-${SARCH}.zip"
-	)
-	if [ $? -ne 0 ] ; then
-		echo "Failed downloading brave"
-		rm -r "$_BUILDDIR";
-		exit 1;
-	fi
-
-	mkdir -p /usr/share/brave
-	cp -r ${_BUILDDIR}/* /usr/share/brave/
-	ln -sf "/usr/share/brave/brave" /bin/
-	ln -sf "/usr/share/brave/brave.desktop" /usr/share/applications/
-	rm -r $_BUILDDIR
-fi
-
diff --git a/srcpkgs/brave/REMOVE b/srcpkgs/brave/REMOVE
deleted file mode 100644
index 5f0deec01e9..00000000000
--- a/srcpkgs/brave/REMOVE
+++ /dev/null
@@ -1,6 +0,0 @@
-# REMOVE for 'brave'
-# Deleting dynamically fetched files
-
-if test "$ACTION" = "post"; then
-	rm -r /usr/share/brave
-fi
diff --git a/srcpkgs/brave/template b/srcpkgs/brave/template
index 6aa0873ded0..087d27670a6 100644
--- a/srcpkgs/brave/template
+++ b/srcpkgs/brave/template
@@ -10,13 +10,13 @@ short_desc="Web browser that stops ads and trackers by default"
 maintainer="Malte Gejr <maltegejr.korup@gmail.com>"
 license="MPL-2.0"
 homepage="https://brave.com/"
-triggers="update-desktopdb"
-_sarch="x64"
-_schecksum="fe5228ab8fdc2d1d3e59e849b4cd3b9a60b6b8a3553011f33382eecb608e0cae"
+distfiles="https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-linux-x64.zip>brave.zip"
+checksum=fe5228ab8fdc2d1d3e59e849b4cd3b9a60b6b8a3553011f33382eecb608e0cae
+
 do_install() {
 	vmkdir /usr/share/brave
-	cp "${FILESDIR}/brave.desktop" "${DESTDIR}/usr/share/brave"
-	echo "export SVERSION=\"${version}\"" >"${DESTDIR}/usr/share/brave/pkgdata"
-	echo "export SARCH=\"${_sarch}\"" >>"${DESTDIR}/usr/share/brave/pkgdata"
-	echo "export SCHECKSUM=\"${_schecksum}\"" >>"${DESTDIR}/usr/share/brave/pkgdata"
+	vinstall "${FILESDIR}/brave.desktop" 755 "/usr/share/applications/"
+	cd ${wrksrc} && unzip -q "brave.zip" && rm "brave.zip"
+	vbin "${wrksrc}/brave" && rm "${wrksrc}/brave"
+	cp -r ${wrksrc}/* "${DESTDIR}/usr/share/brave"
 }