Adopted and resubmitted. Builds nixnote2 from source.

3 files changed, 59 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82cd949071ff..2ae34348f9c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,28 @@
+# Generated by mksrcinfo v8
+# Sat Sep  2 15:45:47 UTC 2017
 pkgbase = nixnote2
-	pkgdesc = Formerly called nevernote, nixnote is a clone of Evernote designed to run on Linux
+	pkgdesc = Evernote clone (formerly Nevernote)
 	pkgver = 2.0
-	pkgrel = 4
-	url = http://www.sourceforge.net/projects/nevernote
+	pkgrel = 5
+	url = http://www.nixnote.org
 	arch = x86_64
 	arch = i686
 	license = GPL2
-	depends = mimetex
-	depends = opencv
+	makedepends = boost
+	makedepends = opencv
+	makedepends = hunspell
 	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
-	provides = nixnote2
-	conflicts = nixnote
-	conflicts = nixnote2-git
+	depends = tidy
+	depends = boost-libs
+	optdepends = opencv: Webcam plugin
+	optdepends = hunspell: Spell check plugin
+	provides = nixnote=2.0
 	conflicts = nixnote-beta
-	replaces = nixnote
-	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
+	conflicts = nixnote
+	replaces = nevernote
+	source = nixnote2-2.0.tar.gz::https://github.com/baumgarr/nixnote2/archive/v2.0.tar.gz
+	sha256sums = 15016caf90bfe09d44fcac4fa4039756eb7efbaf8469505373577f846ee67dcc
 
 pkgname = nixnote2
 
diff --git a/PKGBUILD b/PKGBUILD
index dc8755fa6b78..03507908134a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,50 @@
-# Maintainer: mortzprk <mortz.prk@gmail.com>
+# Maintainer: twa022 <twa022 at gmail dot com>
 
+_pkgname=nixnote
 pkgname=nixnote2
-_pkgname=nixnote2
 pkgver=2.0
-_pkgver="NixNote2%20-%202.0"
-pkgrel=4
-pkgdesc="Formerly called nevernote, nixnote is a clone of Evernote designed to run on Linux"
-url="http://www.sourceforge.net/projects/nevernote"
+pkgrel=5
+pkgdesc="Evernote clone (formerly Nevernote)"
+url="http://www.nixnote.org"
 arch=('x86_64' 'i686')
 license=('GPL2')
-provides=('nixnote2')
-conflicts=('nixnote' 'nixnote2-git' 'nixnote-beta')
-replaces=('nixnote')
-source=("nixnote2.desktop")
+conflicts=("${_pkgname}-beta" "${_pkgname}")
+provides=("${_pkgname}=${pkgver}")
+replaces=('nevernote')
+depends=('poppler-qt5' 'qt5-webkit' 'tidy' 'boost-libs')
+makedepends=('boost' 'opencv' 'hunspell')
+optdepends=('opencv:   Webcam plugin'
+            'hunspell: Spell check plugin')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/baumgarr/nixnote2/archive/v${pkgver}.tar.gz")
+sha256sums=('15016caf90bfe09d44fcac4fa4039756eb7efbaf8469505373577f846ee67dcc')
 
-depends=('mimetex' 'opencv' 'poppler-qt5' 'qt5-webkit' 'sqlite' 'tidyhtml' 'libcurl-compat' 'hunspell' 'libpng' 'intel-tbb' 'openexr' 'ffmpeg' 'libdc1394')
-sha256sums=('227e6b13fce129adb492b1ab4b94eb3b56777a5939d02ae606b07f217bdb6182')
-source_x86_64=("https://superb-sea2.dl.sourceforge.net/project/nevernote/${_pkgver}/Linux/Qt5/${_pkgname}-2.0_amd64.tar.gz")
-sha256sums_x86_64=('932055ac4e47e205b95642c19000e7c8fe06e688e536fa9d1ec49ecdaf86eab4')
-source_i686=("https://superb-sea2.dl.sourceforge.net/project/nevernote/${_pkgver}/Linux/Qt5/${_pkgname}-2.0_i386.tar.gz")
-sha256sums_i686=('9a829cd33ad7fbd6f1e83a0b3182aa3e6be2c56a9f5dbd6ed32cc320b0f9cec2')
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  qmake ./NixNote2.pro
+  make
+  
+  # Build the plugins
+  cd plugins/hunspell
+  qmake Hunspell.pro
+  cd -
+  
+  cd plugins/webcam
+  qmake WebCam.pro
+}
 
 package() {
-    cp -R "${srcdir}/nixnote2/usr" "${pkgdir}/"
-    install -D -m644 nixnote2.desktop ${pkgdir}/usr/share/applications/nixnote2.desktop
-}
\ No newline at end of file
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  mkdir -p "${pkgdir}"/usr/lib/nixnote2/plugins
+  install -m755 plugins/*so "${pkgdir}"/usr/lib/nixnote2/plugins/
+  # Binaries should really be in lib, not share
+  ln -s '../..'/lib/nixnote2/plugins "${pkgdir}"/usr/share/nixnote2/plugins
+  
+  install -m644 theme.ini "${pkgdir}"/usr/share/nixnote2/theme.ini
+  
+  sed -i 's:nevernote:nixnote:g' shortcuts_howto.txt
+  install -Dm644 shortcuts_howto.txt "${pkgdir}"/usr/doc/nixnote2/shortcuts_howto.txt
+  install -Dm644 shortcuts.txt "${pkgdir}"/usr/doc/nixnote2/shortcuts_sample.txt
+}
diff --git a/nixnote2.desktop b/nixnote2.desktop
deleted file mode 100644
index 630e5f76eebb..000000000000
--- a/nixnote2.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[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;