New version

5 files changed, 59 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52b2f9b32f74..3e50743f9709 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,34 @@
 pkgbase = joxi
 	pkgdesc = Easy to use screenshot sharing application (Russian)
-	pkgver = 2.4.0
-	pkgrel = 4
-	url = http://joxi.ru/
-	arch = i386
+	pkgver = 3.0.9
+	pkgrel = 1
+	url = http://joxi.net
+	arch = i686
 	arch = x86_64
 	license = unknown
-	depends = qt4
-	depends = libpng12
-	depends = quazip
-	depends = opencv<3
-	depends = openssl098
+	depends = qt5-declarative
+	depends = qt5-x11extras
+	depends = qt5-base
+	depends = qt5-script
+	depends = qt5-xmlpatterns
+	depends = qt5-multimedia
+	depends = qt5-quick1
+	depends = libgl
+	depends = libx11
+	depends = libstdc++5
+	depends = libxdamage
+	depends = glib2
+	depends = gtk2
+	depends = libmcrypt
+	depends = libcurl-compat
+	depends = libappindicator-gtk2
 	options = emptydirs
-	source = http://bc.cdn.joxi.ru/download/joxi_amd64.deb
+	source = http://dl.joxi.ru/linux/joxi-3.0.9_amd64.deb
+	source = joxi.ld_preload.wrapper
 	source = joxi.desktop
-	source = joxi.sh
-	md5sums = 9be5f0051b4d2c8ae0669115ccb74d17
-	md5sums = 66ef866e3fe32bbfd9eb72fe5ce02b7e
-	md5sums = 93274063806e203654b13884b6e6871c
+	md5sums = 5f486dc525c3031a46416194cb1845be
+	md5sums = fa1d9cf5344c0e586d1cf0784713195b
+	md5sums = 35fc3adf057a6c83ab216fe76dbe5b9a
 
 pkgname = joxi
 
diff --git a/PKGBUILD b/PKGBUILD
index 095cab2c27c4..fdc875d628c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,43 @@
 # Maintainer: Ilya Kovalenko <agentsib@gmail.com>
 
 pkgname=joxi
-pkgver=2.4.0
-pkgrel=4
+pkgver=3.0.9
+pkgrel=1
 pkgdesc="Easy to use screenshot sharing application (Russian)"
-arch=('i386' 'x86_64')
-url="http://joxi.ru/"
+arch=('i686' 'x86_64')
+url="http://joxi.net"
 license=('unknown')
 options=('emptydirs')
-depends=('qt4' 'libpng12' 'quazip' 'opencv<3' 'openssl098')
+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
-  ARCH='amd64'
-  md5sums=(
-			'9be5f0051b4d2c8ae0669115ccb74d17'
-			'66ef866e3fe32bbfd9eb72fe5ce02b7e'
-			'93274063806e203654b13884b6e6871c'
-		  )
-
+    ARCH='amd64'
+    md5sums=("5f486dc525c3031a46416194cb1845be" "fa1d9cf5344c0e586d1cf0784713195b" "35fc3adf057a6c83ab216fe76dbe5b9a")
 elif [ "${CARCH}" = 'i686' ]; then
-  ARCH='i386'
-  md5sums=(
-            '3606c1987b4707499ece7cf5d915358d'
-			'66ef866e3fe32bbfd9eb72fe5ce02b7e'
-			'93274063806e203654b13884b6e6871c'
-          )
+    ARCH='i386'
+    md5sums=("48327f33e6b055c26d25ba40717e291b" "fa1d9cf5344c0e586d1cf0784713195b" "35fc3adf057a6c83ab216fe76dbe5b9a")
 fi
 
-source=("http://bc.cdn.joxi.ru/download/${pkgname}_${ARCH}.deb" "${pkgname}.desktop" "${pkgname}.sh")
-package(){
-   ar -x "${srcdir}/${pkgname}_${ARCH}.deb"
-   tar -zxf "${srcdir}/data.tar.gz"
-   mkdir -p ${srcdir}/usr/lib/joxi
-   ln -s /usr/lib/libcrypto.so.0.9.8 ${srcdir}/usr/lib/joxi/libcrypto.so.1.0.0 
-   ln -s /usr/lib/libssl.so.0.9.8 ${srcdir}/usr/lib/joxi/libssl.so.1.0.0 
+source=(
+    "http://dl.joxi.ru/linux/${pkgname}-${pkgver}_${ARCH}.deb"
+    "joxi.ld_preload.wrapper"
+    "joxi.desktop"
+)
+
+package() {
+    ar -x "${srcdir}/${pkgname}-${pkgver}_${ARCH}.deb"
+    tar -Jxf "${srcdir}/data.tar.xz"
+    sed -i -e 's# /opt/joxi/icon_64.png#/usr/share/icons/hicolor/icon_64.png#' "${srcdir}/usr/share/applications/Joxi.desktop"
+
+    # 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}/usr/share/icons/hicolor/icon_64.png"
+    install -D -m644 "${srcdir}/opt/${pkgname}/icon_light.png" "${pkgdir}/usr/share/icons/hicolor/icon_light.png"
 
-   install -D -m755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/joxi"
-   install -d "${pkgdir}/usr/lib/joxi"
-   install -D -m755 "${srcdir}/usr/bin/joxi" "${pkgdir}/usr/lib/joxi/joxi"
+    install -D -m755 "${srcdir}/usr/bin/joxi" "${pkgdir}/opt/joxi/joxi"
 
-   ln -s /usr/lib/libcrypto.so.0.9.8 ${pkgdir}/usr/lib/joxi/libcrypto.so.1.0.0 
-   ln -s /usr/lib/libssl.so.0.9.8 ${pkgdir}/usr/lib/joxi/libssl.so.1.0.0 
+    install -D -m755 "${srcdir}/joxi.ld_preload.wrapper" "${pkgdir}/usr/bin/joxi"
 
-   install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-   install -D -m644 "${srcdir}/opt/joxi/icon_64.png" "${pkgdir}/usr/share/pixmaps/joxi.png"
-   install -D -m644 "${srcdir}/usr/share/doc/joxi/doc/analytics/protocol" "${pkgdir}/usr/share/doc/joxi/doc/analytics/protocol"
+    install -D -m755 "${srcdir}/joxi.desktop" "${pkgdir}/usr/share/applications/Joxi.desktop"
 }
diff --git a/joxi.desktop b/joxi.desktop
index 66e1049c81de..81ec3602d2c7 100644
--- a/joxi.desktop
+++ b/joxi.desktop
@@ -1,13 +1,12 @@
 [Desktop Entry]
 Categories=Network;Application;
-Comment=Joxi
-Exec=joxi
+Comment=joxi
+Exec=/usr/bin/joxi
 GenericName=joxi
 Name=Joxi
 X-KDE-StartupNotify=true
 MimeType=application/x-designer;
-Icon=joxi.png
+Icon=/usr/share/icons/hicolor/icon_64.png
 Terminal=false
 Type=Application
 Version=0.1
-Name[ru_RU]=Joxi
diff --git a/joxi.ld_preload.wrapper b/joxi.ld_preload.wrapper
new file mode 100644
index 000000000000..0750aa56d79d
--- /dev/null
+++ b/joxi.ld_preload.wrapper
@@ -0,0 +1,3 @@
+#!/bin/sh
+export LD_PRELOAD=libcurl.so.3
+/opt/joxi/joxi "$@"
diff --git a/joxi.sh b/joxi.sh
deleted file mode 100644
index 766fe84fb685..000000000000
--- a/joxi.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export LD_LIBRARY_PATH=LD_LIBRARY_PATH:/usr/lib/joxi
-exec /usr/lib/joxi/joxi