Added missing dependencies and PKGBUILD rewrite

6 files changed, 61 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8764f05d667d..8cfdcbc43b0f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,25 @@
 pkgbase = franz-bin
-	pkgdesc = Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more. Binrary from debian package without compiling.
+	pkgdesc = Franz is a free messaging app for services like WhatsApp, Slack, Messenger and many more
 	pkgver = 5.0.0_beta.18
-	pkgrel = 1
+	pkgrel = 2
 	url = https://meetfranz.com
-	install = franz-bin.install
 	arch = x86_64
 	license = Apache
+	depends = alsa-lib
 	depends = gconf
-	depends = libnotify
-	depends = libappindicator-gtk2
+	depends = gtk2
+	depends = libsecret
+	depends = libxss
 	depends = libxtst
 	depends = nss
-	depends = libxss
+	optdepends = gnome-keyring
+	conflicts = franz
 	options = !strip
 	options = !emptydirs
-	source_x86_64 = https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.18/franz_5.0.0-beta.18_amd64.deb
-	sha512sums_x86_64 = dcee8ff93392c41f1d5e6d4c058fc5e05b592e6db23589f81207eeee0012d96fa569f0d8a79506e46b1ebd5575c4cb0840eedcc686fd9e4463323a0a29641faf
+	source = https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.18/franz_5.0.0-beta.18_amd64.deb
+	source = franz-bin.patch
+	sha256sums = f5761b4441a02227915d347a56a06944760a50c91ef9e11e28f848fc35622fb9
+	sha256sums = e0d03405a75a0cd4492875b111d4750b8a925b514f3ce9ef47b69b9fcaee2b7f
 
 pkgname = franz-bin
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..221ed8768fdb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*
+!.gitignore
+!franz-bin.patch
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index fbd6647edca2..8804ca63918f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,42 @@
-# Maintainer: Utsob Roy uroybd@gmail.com
-# Contributor: Utsob Roy uroybd@gmail.com
+# Maintainer: "Amhairghin" Oscar Garcia Amor (https://ogarcia.me)
+# Contributor: Utsob Roy <uroybd(at)gmail(dot)com>
+
 pkgname=franz-bin
 pkgver=5.0.0_beta.18
-pkgrel=1
-pkgdesc="Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more. Binrary from debian package without compiling."
+pkgrel=2
+pkgdesc='Franz is a free messaging app for services like WhatsApp, Slack, Messenger and many more'
 arch=('x86_64')
-url="https://meetfranz.com"
+url='https://meetfranz.com'
 license=('Apache')
-groups=('')
-depends=('gconf' 'libnotify' 'libappindicator-gtk2' 'libxtst' 'nss' 'libxss')
+depends=('alsa-lib' 'gconf' 'gtk2' 'libsecret' 'libxss' 'libxtst' 'nss')
+optdepends=('gnome-keyring')
+conflicts=('franz')
 options=('!strip' '!emptydirs')
-install=${pkgname}.install
-source_x86_64=("https://github.com/meetfranz/franz/releases/download/v${pkgver//_/-}/franz_${pkgver//_/-}_amd64.deb")
-sha512sums_x86_64=('dcee8ff93392c41f1d5e6d4c058fc5e05b592e6db23589f81207eeee0012d96fa569f0d8a79506e46b1ebd5575c4cb0840eedcc686fd9e4463323a0a29641faf')
+source=("https://github.com/meetfranz/franz/releases/download/v${pkgver//_/-}/franz_${pkgver//_/-}_amd64.deb"
+        "${pkgname}.patch")
+sha256sums=('f5761b4441a02227915d347a56a06944760a50c91ef9e11e28f848fc35622fb9'
+            'e0d03405a75a0cd4492875b111d4750b8a925b514f3ce9ef47b69b9fcaee2b7f')
+
+package() {
+  # Extract package data
+  bsdtar -xJf data.tar.xz
+
+  # Install package data
+  mv "usr" "${pkgdir}"
+  install -dm755 "${pkgdir}/usr/bin" "${pkgdir}/usr/lib"
+  mv "opt/Franz" "${pkgdir}/usr/lib/franz"
+  ln -s "../lib/franz/franz" "${pkgdir}/usr/bin/franz"
 
-package(){
+  # Permission fix
+  chmod 644 "${pkgdir}/usr/lib/franz/libnode.so"
 
-	# Extract package data
-	tar xf data.tar.xz -C "${pkgdir}"
+  # Fix binary path in .desktop file
+  patch -d "${pkgdir}" -p1 <"${pkgname}".patch
 
-	install -D -m644 "${pkgdir}/opt/Franz/LICENSES.chromium.html" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  # Link licenses
+  install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  ln -s "/usr/lib/franz/LICENSE.electron.txt" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.electron.txt"
+  ln -s "/usr/lib/franz/LICENSES.chromium.html" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSES.chromium.html"
 }
diff --git a/franz-bin.desktop b/franz-bin.desktop
deleted file mode 100644
index 99906bc0b1dd..000000000000
--- a/franz-bin.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Franz
-Comment=Franz is a free messaging app for services like WhatsApp, Slack, Messenger and many more. 
-Description=Franz is a free messaging app for services like WhatsApp, Slack, Messenger and many more. 
-Exec=franz-bin -- %u
-StartupWMClass=Franz
-Icon=/usr/share/icons/hicolor/1024x1024/apps/franz-bin.png
-Terminal=false
-Type=Application
-Categories=Network;
-X-Desktop-File-Install-Version=0.1
diff --git a/franz-bin.install b/franz-bin.install
deleted file mode 100644
index 78921e9c3deb..000000000000
--- a/franz-bin.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
-	# Link to the binary
-	ln -sf '/opt/Franz/franz' '/usr/bin/franz'
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
-	# Delete the link to the binary
-	rm -f '/usr/bin/franz'
-	update-desktop-database -q
-}
diff --git a/franz-bin.patch b/franz-bin.patch
new file mode 100644
index 000000000000..e0f7f9b5cb8a
--- /dev/null
+++ b/franz-bin.patch
@@ -0,0 +1,11 @@
+--- a/usr/share/applications/franz.desktop	2018-09-12 16:04:43.010695442 +0200
++++ b/usr/share/applications/franz.desktop	2018-09-12 16:05:54.771682179 +0200
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=Franz
+ Comment=Franz is your messaging app / former Emperor of Austria and combines chat & messaging services into one application. Franz currently supports Slack, WhatsApp, WeChat, HipChat, Facebook Messenger, Telegram, Google Hangouts, GroupMe, Skype and many more. You can download Franz for free for Mac & Windows.
+-Exec="/opt/Franz/franz" %U
++Exec=/usr/bin/franz %U
+ Terminal=false
+ Type=Application
+ Icon=franz