Version 2

3 files changed, 54 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99ae4d58c4af..a18050b24e03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,32 @@
-# Generated by mksrcinfo v8
-# Sun Feb 28 16:58:59 UTC 2016
 pkgbase = nixnote
 	pkgdesc = Formerly called nevernote, nixnote is a clone of Evernote designed to run on Linux
-	pkgver = 1.6
+	pkgver = 2.0
 	pkgrel = 1
 	url = http://www.sourceforge.net/projects/nevernote
 	arch = x86_64
 	arch = i686
 	license = GPL2
-	depends = java-runtime
-	depends = libpng12
+	depends = mimetex
+	depends = opencv
+	depends = poppler-qt5
+	depends = qt5-webkit
+	depends = sqlite
+	depends = tidyhtml
+	depends = libcurl-compat
+	depends = hunspell
+	depends = libpng
+	depends = intel-tbb
+	depends = openexr
+	depends = ffmpeg
+	depends = libdc1394
+	conflicts = nixnote2
 	conflicts = nixnote-beta
-	source_x86_64 = http://download2.polytechnic.edu.na/pub4/sourceforge/n/project/project/ne/nevernote/NixNote%201.6/nixnote-1.6_amd64.tar.gz
-	sha256sums_x86_64 = 781f8b9cbe3e1137b62d4dbb76670b3e2d5a20403b04b3767e03a2e89dba860e
-	source_i686 = http://download2.polytechnic.edu.na/pub4/sourceforge/n/project/project/ne/nevernote/NixNote%201.6/nixnote-1.6_i386.tar.gz
-	sha256sums_i686 = 50be711e33d37fd43590845718e5e5710cc48a5f7f745df8990b0f792da3a7da
+	source = nixnote2.desktop
+	sha256sums = 227e6b13fce129adb492b1ab4b94eb3b56777a5939d02ae606b07f217bdb6182
+	source_x86_64 = https://superb-sea2.dl.sourceforge.net/project/nevernote/NixNote2%20-%202.0/Linux/Qt5/nixnote2-2.0_amd64.tar.gz
+	sha256sums_x86_64 = 932055ac4e47e205b95642c19000e7c8fe06e688e536fa9d1ec49ecdaf86eab4
+	source_i686 = https://superb-sea2.dl.sourceforge.net/project/nevernote/NixNote2%20-%202.0/Linux/Qt5/nixnote2-2.0_i386.tar.gz
+	sha256sums_i686 = 9a829cd33ad7fbd6f1e83a0b3182aa3e6be2c56a9f5dbd6ed32cc320b0f9cec2
 
 pkgname = nixnote
 
diff --git a/PKGBUILD b/PKGBUILD
index 37da557b885b..12014e660803 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,28 @@
-# Maintainer: yaroslav <proninyaroslav@mail.ru>
+# Maintainer: mortzprk <mortz.prk@gmail.com>
+# Contributor: yaroslav <proninyaroslav@mail.ru>
 # Contributor: Chris Fordham <chris at fordham-nagy dot id dot au> aka flaccid
 # Contributor: J. Luck <jluck@udel.edu>
 # Package Build Source: https://github.com/flaccid/archlinux-packages/blob/master/nixnote/PKGBUILD
 
 pkgname=nixnote
-pkgver=1.6
-_pkgver='NixNote%201.6'
+_pkgname=nixnote2
+pkgver=2.0
+_pkgver="NixNote2%20-%202.0"
 pkgrel=1
 pkgdesc="Formerly called nevernote, nixnote is a clone of Evernote designed to run on Linux"
 url="http://www.sourceforge.net/projects/nevernote"
 arch=('x86_64' 'i686')
 license=('GPL2')
-depends=('java-runtime' 'libpng12')
-conflicts=('nixnote-beta')
-source_x86_64=("http://download2.polytechnic.edu.na/pub4/sourceforge/n/project/project/ne/nevernote/${_pkgver}/${pkgname}-${pkgver}_amd64.tar.gz")
-sha256sums_x86_64=('781f8b9cbe3e1137b62d4dbb76670b3e2d5a20403b04b3767e03a2e89dba860e')
-source_i686=("http://download2.polytechnic.edu.na/pub4/sourceforge/n/project/project/ne/nevernote/${_pkgver}/${pkgname}-${pkgver}_i386.tar.gz")
-sha256sums_i686=('50be711e33d37fd43590845718e5e5710cc48a5f7f745df8990b0f792da3a7da')
+conflicts=('nixnote2' 'nixnote-beta')
+depends=('mimetex' 'opencv' 'poppler-qt5' 'qt5-webkit' 'sqlite' 'tidyhtml' 'libcurl-compat' 'hunspell' 'libpng' 'intel-tbb' 'openexr' 'ffmpeg' 'libdc1394')
+source=("nixnote2.desktop")
+sha256sums=('227e6b13fce129adb492b1ab4b94eb3b56777a5939d02ae606b07f217bdb6182')
+source_x86_64=("https://superb-sea2.dl.sourceforge.net/project/nevernote/${_pkgver}/Linux/Qt5/${_pkgname}-${pkgver}_amd64.tar.gz")
+sha256sums_x86_64=('932055ac4e47e205b95642c19000e7c8fe06e688e536fa9d1ec49ecdaf86eab4')
+source_i686=("https://superb-sea2.dl.sourceforge.net/project/nevernote/${_pkgver}/Linux/Qt5/${_pkgname}-${pkgver}_i386.tar.gz")
+sha256sums_i686=('9a829cd33ad7fbd6f1e83a0b3182aa3e6be2c56a9f5dbd6ed32cc320b0f9cec2')
 
 package() {
-    cp -R "${srcdir}/nixnote/usr" "${pkgdir}/"
-    mv "${pkgdir}/usr/bin/nixnote.sh" "${pkgdir}/usr/bin/nixnote"
-}
+    cp -R "${srcdir}/nixnote2/usr" "${pkgdir}/"
+    install -D -m644 nixnote2.desktop ${pkgdir}/usr/share/applications/nixnote2.desktop
+}
\ No newline at end of file
diff --git a/nixnote2.desktop b/nixnote2.desktop
new file mode 100644
index 000000000000..630e5f76eebb
--- /dev/null
+++ b/nixnote2.desktop
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Name=NixNote2
+Comment=Use with Evernote to remember everything
+GenericName=Evernote-clone
+Exec=env "LD_PRELOAD=libcurl.so.3" /usr/bin/nixnote2
+Icon=/usr/share/nixnote2/images/windowIcon.png
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Network;
+MimeType=x-scheme-handler/evernote;
+
+Actions=NewNote;
+[Desktop Action NewNote]
+Name=New Note
+Exec=env "LD_PRELOAD=libcurl.so.3" /usr/bin/nixnote2 --newNote
+OnlyShowIn=Unity;