update to 1.2.2

3 files changed, 54 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 346d5955198e..84fc8ff4d874 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,25 @@
 pkgbase = treehole-ocr
 	pkgdesc = A Cross-Platform OCR Tool
-	pkgver = 1.2.0
-	pkgrel = 3
+	pkgver = 1.2.2
+	pkgrel = 1
 	url = https://github.com/AnyListen/tools-ocr
 	arch = any
 	license = GPL3
 	makedepends = imagemagick
+	makedepends = java-runtime-openjdk=8
 	depends = java8-openjfx
-	depends = java-runtime=8
-	noextract = treehole-1.2.0.dmg
-	source = https://github.com/AnyListen/tools-ocr/releases/download/V1.2.0/treehole-1.2.0.dmg
-	source = https://github.com/AnyListen/tools-ocr/raw/master/src/main/resources/img/logo.png
+	noextract = hutool-all-5.3.3.jar
+	noextract = imgscalr-lib-4.2.jar
+	source = https://github.com/AnyListen/tools-ocr/archive/V1.2.2.tar.gz
+	source = https://github.com/kwhat/jnativehook/releases/download/2.1.0/jnativehook-2.1.0.zip
+	source = https://repo1.maven.org/maven2/org/imgscalr/imgscalr-lib/4.2/imgscalr-lib-4.2.jar
+	source = https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.3.3/hutool-all-5.3.3.jar
 	source = treehole-ocr.desktop
-	sha256sums = 3d38b14b5b9dca801cab79f8eb483d512699b79adfad377bf6e200fb7c70b572
-	sha256sums = d73ab0e0b7b6775d3346217d80324ce6d56fe567859be5744bb9810b3c176f7a
-	sha256sums = 36379443dba98f830f0bbe60bc79b6b4be8130e67bb10ac4faeadf6a1a4de7d5
+	sha256sums = bb0eb0b3b5b52870e97b9cc635d313ddefa3505e8066b95a03d6e422a42aee17
+	sha256sums = 753c9b72e79f0b7fd389ebf6aa834f359b9f6ed6475e25a0d931baa141643ee6
+	sha256sums = 6f128a71c5e87a16f810513a73ad3c77d0ee0bb622ee0ce1ead115bccbc76d0a
+	sha256sums = b1a079317cdb6c496955ed41c48afa3695ab664d004c2e2e0850e4180c749da4
+	sha256sums = 897410c55bbb0ae04c25b21522e4abde8430332dc09cf9e130057e9351f2eb8e
 
 pkgname = treehole-ocr
 
diff --git a/PKGBUILD b/PKGBUILD
index 233314de4d40..d1700d4e762a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,43 @@
 # Maintainer: qaz <fkxxyz@163.com>
 # Contributor: qaz <fkxxyz@163.com>
 
-_name=treehole
-pkgname=$_name-ocr
-_itemname=tools-ocr
-pkgver=1.2.0
-pkgrel=3
+pkgname=treehole-ocr
+_pkgname=tools-ocr
+_hutool_ver=5.3.3
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="A Cross-Platform OCR Tool"
 arch=(any)
-url="https://github.com/AnyListen/${_itemname}"
+url="https://github.com/AnyListen/${_pkgname}"
 license=('GPL3')
-makedepends=('imagemagick')
-depends=('java8-openjfx' 'java-runtime=8')
+makedepends=('imagemagick' 'java-runtime-openjdk=8')
+depends=('java8-openjfx')
 source=(
-  "https://github.com/AnyListen/$_itemname/releases/download/V$pkgver/treehole-$pkgver.dmg"
-  "https://github.com/AnyListen/$_itemname/raw/master/src/main/resources/img/logo.png"
+  "https://github.com/AnyListen/${_pkgname}/archive/V${pkgver}.tar.gz"
+  "https://github.com/kwhat/jnativehook/releases/download/2.1.0/jnativehook-2.1.0.zip"
+  "https://repo1.maven.org/maven2/org/imgscalr/imgscalr-lib/4.2/imgscalr-lib-4.2.jar"
+  "https://repo1.maven.org/maven2/cn/hutool/hutool-all/${_hutool_ver}/hutool-all-${_hutool_ver}.jar"
   ${pkgname}.desktop
 )
-noextract=("treehole-$pkgver.dmg")
-
-prepare() {
-  7z x -y treehole-$pkgver.dmg
-}
+noextract=("hutool-all-${_hutool_ver}.jar" "imgscalr-lib-4.2.jar")
 
 build() {
-  mkdir -p "$srcdir/pngs"
-  cd "$srcdir/pngs"
-  cp ../logo.png 128x128.png
+  PATH=/usr/lib/jvm/java-8-openjdk/bin:$PATH
+  
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+echo "Manifest-Version: 1.0
+Main-Class: com.luooqi.ocr.MainFm
+Class-Path: lib/jnativehook-2.1.0.jar lib/hutool-all-${_hutool_ver}.jar lib/imgscalr-lib-4.2.jar" > MANIFEST.MF
+  
+  mkdir lib
+  cp -f "${srcdir}/imgscalr-lib-4.2.jar" lib/
+  mv -f "${srcdir}/jnativehook/jar/jnativehook-2.1.0.jar" lib/
+  cp -f "${srcdir}/hutool-all-${_hutool_ver}.jar" lib/
+  mkdir bin png
+  find ./src/main/java -name "*.java" | xargs \
+    javac -d bin -classpath "lib/hutool-all-${_hutool_ver}.jar:lib/imgscalr-lib-4.2.jar:lib/jnativehook-2.1.0.jar"
+  jar -cfm ${pkgname}.jar MANIFEST.MF -C bin . -C src/main/resources .
+  cp src/main/resources/img/logo.png 128x128.png
   convert -resize 50% 128x128.png 64x64.png
   convert -resize 37.8% 128x128.png 48x48.png
   convert -resize 25% 128x128.png 32x32.png
@@ -35,28 +46,27 @@ build() {
 }
 
 package() {
-  install -d "${pkgdir}/usr/share/applications"
-  sed 's/^Version=$/Version='$pkgver'/g' ${pkgname}.desktop > "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -D ${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop"
   
-  cd "$srcdir/pngs"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   for png in *.png; do
     install -D ./${png} "${pkgdir}/usr/share/icons/hicolor/${png%.*}/apps/${pkgname}.png"
   done
   
-  install -d "${pkgdir}/usr/share/${pkgname}/lib"
-  cp -r "$srcdir/treehole/treehole.app/Contents/Java/"* "${pkgdir}/usr/share/${pkgname}"
+  install -D "./${pkgname}.jar" "${pkgdir}/usr/share/${pkgname}/${pkgname}.jar"
+  cp -r "./lib" "${pkgdir}/usr/share/${pkgname}/lib"
   
   install -d "${pkgdir}/usr/bin"
   echo "#!/bin/bash
 PATH=/usr/lib/jvm/java-8-openjdk/bin:\$PATH
-java -jar /usr/share/${pkgname}/$_name-$pkgver-jfx.jar
+java -jar /usr/share/${pkgname}/${pkgname}.jar
 " > "${pkgdir}/usr/bin/${pkgname}"
   chmod +x "${pkgdir}/usr/bin/${pkgname}"
 }
 
 # vim:set ts=2 sw=2 et:
-sha256sums=('3d38b14b5b9dca801cab79f8eb483d512699b79adfad377bf6e200fb7c70b572'
-            'd73ab0e0b7b6775d3346217d80324ce6d56fe567859be5744bb9810b3c176f7a'
-            '36379443dba98f830f0bbe60bc79b6b4be8130e67bb10ac4faeadf6a1a4de7d5')
-
-
+sha256sums=('bb0eb0b3b5b52870e97b9cc635d313ddefa3505e8066b95a03d6e422a42aee17'
+            '753c9b72e79f0b7fd389ebf6aa834f359b9f6ed6475e25a0d931baa141643ee6'
+            '6f128a71c5e87a16f810513a73ad3c77d0ee0bb622ee0ce1ead115bccbc76d0a'
+            'b1a079317cdb6c496955ed41c48afa3695ab664d004c2e2e0850e4180c749da4'
+            '897410c55bbb0ae04c25b21522e4abde8430332dc09cf9e130057e9351f2eb8e')
diff --git a/treehole-ocr.desktop b/treehole-ocr.desktop
index 254a31feefb9..6cd777bf1c1e 100644
--- a/treehole-ocr.desktop
+++ b/treehole-ocr.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=
+Version=1.2.2
 Name=Treehole OCR
 GenericName=OCR
 Comment=A Cross-Platform OCR Tool