add .desktop file and icons

10 files changed, 55 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ecb65bba97b..7b1da04723de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = briar-desktop-git
 	pkgdesc = Prototyping the next generation for Briar on desktop devices
 	pkgver = r307.38723c4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://code.briarproject.org/briar/briar-desktop
 	arch = x86_64
 	arch = aarch64
@@ -16,7 +16,21 @@ pkgbase = briar-desktop-git
 	conflicts = briar-desktop
 	source = briar-desktop::git+https://code.briarproject.org/briar/briar-desktop.git
 	source = briar::git+https://code.briarproject.org/briar/briar
+	source = briar16.png
+	source = briar32.png
+	source = briar48.png
+	source = briar64.png
+	source = briar128.png
+	source = briar192.png
+	source = briar-desktop.desktop
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = 965d7c617e345b809f84c8bf73d9cb0acaf763c16a4b367698218b90c1c92669
+	sha256sums = 3feb96f9b9c01085170a44fdbf8bca43b1e586fe3b68dab37fb5cb9fd4ca1fa6
+	sha256sums = 3ba1a6a3561f3b879d8295cf3397bda6c7710f138f6cbd7effe4f650765610a0
+	sha256sums = 25eb65911af5e85d193e0d60418757a2ffe7b3d7d9d3debc41259bc0503972a7
+	sha256sums = 2a3e508279c2a440372bf73da2c4acf56a9b7a0bcad886a74863f5a723413a93
+	sha256sums = a00d60b7aa59fb573c2e42f8bb4c23eb7038c91ea5ced47ebf9d537e3f3925cf
+	sha256sums = ac7f0dc86bce256dc80fbee7c65705b6dc9cdbd8f0ad942f0535f82b65ef2f83
 
 pkgname = briar-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index a86aba453ab5..f865799f3081 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 pkgname=briar-desktop-git
 _pkgname=briar-desktop
 pkgver=r307.38723c4
-pkgrel=2
+pkgrel=3
 _build_type=nightly
 pkgdesc='Prototyping the next generation for Briar on desktop devices'
 arch=('x86_64' 'aarch64' 'armv7h')
@@ -11,10 +11,19 @@ license=('GPL')
 depends=('java-runtime>=17' 'java-runtime<18' 'bash')
 makedepends=('git' 'jdk-openjdk>=17' 'jdk-openjdk<18')
 conflicts=('briar-desktop')
-source=("${_pkgname}::git+https://code.briarproject.org/briar/briar-desktop.git"
-        "briar::git+https://code.briarproject.org/briar/briar")
+source=("${_pkgname}::git+https://code.briarproject.org/briar/${_pkgname}.git"
+        "briar::git+https://code.briarproject.org/briar/briar"
+        "briar16.png" "briar32.png" "briar48.png" "briar64.png" "briar128.png" "briar192.png"
+        "${_pkgname}.desktop")
 sha256sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            '965d7c617e345b809f84c8bf73d9cb0acaf763c16a4b367698218b90c1c92669'
+            '3feb96f9b9c01085170a44fdbf8bca43b1e586fe3b68dab37fb5cb9fd4ca1fa6'
+            '3ba1a6a3561f3b879d8295cf3397bda6c7710f138f6cbd7effe4f650765610a0'
+            '25eb65911af5e85d193e0d60418757a2ffe7b3d7d9d3debc41259bc0503972a7'
+            '2a3e508279c2a440372bf73da2c4acf56a9b7a0bcad886a74863f5a723413a93'
+            'a00d60b7aa59fb573c2e42f8bb4c23eb7038c91ea5ced47ebf9d537e3f3925cf'
+            'ac7f0dc86bce256dc80fbee7c65705b6dc9cdbd8f0ad942f0535f82b65ef2f83')
 
 case "$CARCH" in
   armv7h)
@@ -57,4 +66,23 @@ EOF
   chmod +x "$pkgdir/usr/bin/$_pkgname"
 
   install -m 644 -D "build/compose/jars/Briar-linux-${_gradle_arch}-${_bin_ver}-${_build_type}.jar" "$pkgdir/usr/share/java/$_pkgname.jar"
+
+  install -Dm644 ${srcdir}/${_pkgname}/src/main/resources/images/logo_circle.svg \
+    "$pkgdir/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg"
+
+  # generated with inkscape from the svg
+  # just seemed unreasonable to require inkscape as a makedep
+  # for size in 16 32 48 64 128 192; do
+  # inkscape --export-background-opacity=0 \
+  #     --export-width=${size} --export-type=png \
+  #     --export-filename=${size}.png briar-desktop.svg
+  # done
+
+  for i in 16 32 48 64 128 192; do
+    install -Dm644 ${srcdir}/briar${i}.png \
+      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$_pkgname.png"
+  done
+
+  install -Dm644 ${srcdir}/$_pkgname.desktop \
+    "$pkgdir/usr/share/applications/$_pkgname.desktop"
 }
diff --git a/briar-desktop.desktop b/briar-desktop.desktop
new file mode 100644
index 000000000000..eace7a3266af
--- /dev/null
+++ b/briar-desktop.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Briar Desktop
+Comment=Secure messaging, anywhere
+Exec=/usr/bin/briar-desktop %u
+Icon=briar-desktop
+Terminal=false
+Type=Application
+Categories=Network;Chat;InstantMessaging;
diff --git a/briar-desktop.png b/briar-desktop.png
new file mode 100644
index 000000000000..8874e10e599c
--- /dev/null
+++ b/briar-desktop.png
diff --git a/briar128.png b/briar128.png
new file mode 100644
index 000000000000..fce3de2f685a
--- /dev/null
+++ b/briar128.png
diff --git a/briar16.png b/briar16.png
new file mode 100644
index 000000000000..f06016b368ba
--- /dev/null
+++ b/briar16.png
diff --git a/briar192.png b/briar192.png
new file mode 100644
index 000000000000..475670c83f5a
--- /dev/null
+++ b/briar192.png
diff --git a/briar32.png b/briar32.png
new file mode 100644
index 000000000000..158e66b7ea51
--- /dev/null
+++ b/briar32.png
diff --git a/briar48.png b/briar48.png
new file mode 100644
index 000000000000..e419e98cbba5
--- /dev/null
+++ b/briar48.png
diff --git a/briar64.png b/briar64.png
new file mode 100644
index 000000000000..ffd2257d4fe4
--- /dev/null
+++ b/briar64.png