Modif....

3 files changed, 22 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d6b70ad44fdc..b25c2af3d16a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
+# Generated by mksrcinfo v8
+# Mon Aug 13 12:16:51 UTC 2018
 pkgbase = joxi
-	pkgdesc = Easy to use screenshot sharing application (Russian)
-	pkgver = 3.0.9
-	pkgrel = 3
+	pkgdesc = Free tool for screen capture
+	pkgver = 3.0.13
+	pkgrel = 1
 	url = http://joxi.net
-	arch = i686
 	arch = x86_64
-	license = unknown
+	license = Custom
 	depends = qt5-declarative
 	depends = qt5-x11extras
 	depends = qt5-base
@@ -22,11 +23,8 @@ pkgbase = joxi
 	depends = libmcrypt
 	depends = libcurl-compat
 	depends = libappindicator-gtk2
-	options = emptydirs
-	source = http://dl.joxi.ru/linux/joxi-net_x86_64-fr.rpm
-	source = joxi.ld_preload.wrapper
-	md5sums = 5c2ef9b7e6b39dfb731f62ef0d146cb7
-	md5sums = fa1d9cf5344c0e586d1cf0784713195b
+	source_x86_64 = http://dl.joxi.ru/linux/joxi-amd64.deb
+	sha512sums_x86_64 = 05f54d2a544b30fdd887e8aa2689ffc2395d69b1649c9cf0d667beaaf13d39ade72d31d45103fe13a120d5da2e3144ce5c6e4db81688a20e253ef160b7ea4f4b
 
 pkgname = joxi
 
diff --git a/PKGBUILD b/PKGBUILD
index 4795ed97e769..e576bde2428a 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,20 @@
-# Maintainer: Ilya Kovalenko <agentsib@gmail.com>
-# Contributors: elbahek <elbahek@gmail.com>
-
+# Maintainer: liberodark
 
 pkgname=joxi
-pkgver=3.0.9
-pkgrel=3
-pkgdesc="Easy to use screenshot sharing application (Russian)"
-arch=('i686' 'x86_64')
+pkgver=3.0.13
+pkgrel=1
+pkgdesc="Free tool for screen capture"
+arch=('x86_64')
 url="http://joxi.net"
-license=('unknown')
-options=('emptydirs')
+license=('Custom')
 depends=('qt5-declarative' 'qt5-x11extras' 'qt5-base' 'qt5-script' 'qt5-xmlpatterns' 'qt5-multimedia' 'qt5-quick1' 'libgl' 'libx11' 'libstdc++5' 'libxdamage' 'glib2' 'gtk2' 'libmcrypt' 'libcurl-compat' 'libappindicator-gtk2')
-
-if [ "${CARCH}" = 'x86_64' ]; then
-    md5sums=("5c2ef9b7e6b39dfb731f62ef0d146cb7" "fa1d9cf5344c0e586d1cf0784713195b")
-elif [ "${CARCH}" = 'i686' ]; then
-    md5sums=("6d62ab37f316f09f3fa666379eae4696" "fa1d9cf5344c0e586d1cf0784713195b")
-fi
-ARCH=${CARCH}
-
-source=(
-	"http://dl.joxi.ru/linux/${pkgname}-net_${ARCH}-fr.rpm"
-    "joxi.ld_preload.wrapper"
-)
-
+source_x86_64=("http://dl.joxi.ru/linux/joxi-amd64.deb")
+sha512sums_x86_64=('05f54d2a544b30fdd887e8aa2689ffc2395d69b1649c9cf0d667beaaf13d39ade72d31d45103fe13a120d5da2e3144ce5c6e4db81688a20e253ef160b7ea4f4b')
+        
 package() {
-
-    # there is no /usr/lib/joxi dir, so this config is pointless
-    install -D -m755 "${srcdir}/etc/ld.so.conf.d/${pkgname}.conf" "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
-
-    install -D -m644 "${srcdir}/opt/${pkgname}/icon_64.png" "${pkgdir}/opt/joxi/icon_64.png"
-    install -D -m644 "${srcdir}/opt/${pkgname}/icon_light.png" "${pkgdir}/opt/joxi/icon_light.png"
-
-    install -D -m755 "${srcdir}/usr/bin/joxi" "${pkgdir}/opt/joxi/joxi"
-    
-	install -D -m755 "${srcdir}/joxi.ld_preload.wrapper" "${pkgdir}/usr/bin/joxi"
-
- 	install -D -m755 "${srcdir}/usr/share/applications/Joxi.desktop" "${pkgdir}/usr/share/applications/Joxi.desktop"
-    # install -D -m755 "${srcdir}/joxi.desktop" "${pkgdir}/usr/share/applications/Joxi.desktop"
+  cd $srcdir
+  tar xvf data.tar.xz
+  cp -r etc $pkgdir
+  cp -r opt $pkgdir
+  cp -r usr $pkgdir
 }
diff --git a/joxi.ld_preload.wrapper b/joxi.ld_preload.wrapper
deleted file mode 100644
index 0750aa56d79d..000000000000
--- a/joxi.ld_preload.wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-export LD_PRELOAD=libcurl.so.3
-/opt/joxi/joxi "$@"