updated to 2.0.0

4 files changed, 30 insertions, 116 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca6beced581a..3933c77c6d50 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,18 @@
 pkgbase = drill-search
-	pkgver = 1.258
+	pkgver = 2.0.0
 	pkgrel = 1
-	url = https://www.drill.santamorena.me
+	url = https://drill.software
 	install = drill-search.install
 	arch = x86_64
 	license = GPL2
-	makedepends = git
 	makedepends = dmd
 	makedepends = dub
-	source = drill-search-1.258.tar.gz::https://github.com/yatima1460/Drill/archive/1.258.tar.gz
+	source = drill-search-2.0.0.tar.gz::https://github.com/yatima1460/Drill/archive/2.0.0.tar.gz
 	source = drill-search
 	source = drill-search-gtk.desktop
-	source = drill-search-gtk.svg
-	source = datefmt::git+https://github.com/dhasenan/datefmt.git#tag=v1.0.3
-	source = gtkd::git+https://github.com/gtkd-developers/GtkD.git#tag=v3.9.0
-	sha256sums = 09fad3a9e2db20be67ab60ea6990a5a50ba41044f164364cf5ec4d06aa521bbf
+	sha256sums = 9ac863f693da7db1deb2e89ec78476a34c89618a1b00149d2e3fb6ae152bbe6a
 	sha256sums = b875f928546aee7855cb1db9afc8ab3f1a8a34d43de5bbd62f7076d7ba9f3917
 	sha256sums = 5bafb37baf608a3168abba2ab9ea174a1d0f0472f52d3222ea0a05957c997c50
-	sha256sums = cbfbcebb2957223eaa9c915780a5d0ac47c1fac70b7944f49e8ffcfe740edc53
-	sha256sums = SKIP
-	sha256sums = SKIP
 
 pkgname = drill-search-cli
 	pkgdesc = Search files without indexing, but clever crawling (CLI version)
diff --git a/PKGBUILD b/PKGBUILD
index 18879d6f63bb..bae0568590e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,72 +1,38 @@
 # Maintainer: Mark Wagie <yochanan dot marqos at gmail dot com>
 pkgname=('drill-search-cli' 'drill-search-gtk')
 pkgbase=drill-search
-pkgver=1.258
+pkgver=2.0.0
 pkgrel=1
 arch=('x86_64')
-url="https://www.drill.santamorena.me"
+url="https://drill.software"
 license=('GPL2')
-makedepends=('git' 'dmd' 'dub')
-_dubv=("1.0.3" #datefmt
-	"3.9.0" #gtkd
-	)
+makedepends=('dmd' 'dub')
 install="$pkgbase.install"
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/yatima1460/Drill/archive/$pkgver.tar.gz"
 	"$pkgbase"
-	"$pkgbase-gtk.desktop"
-	"$pkgbase-gtk.svg"
-	"datefmt::git+https://github.com/dhasenan/datefmt.git#tag=v${_dubv[0]}"
-	"gtkd::git+https://github.com/gtkd-developers/GtkD.git#tag=v${_dubv[1]}")
-sha256sums=('09fad3a9e2db20be67ab60ea6990a5a50ba41044f164364cf5ec4d06aa521bbf'
+	"$pkgbase-gtk.desktop")
+sha256sums=('9ac863f693da7db1deb2e89ec78476a34c89618a1b00149d2e3fb6ae152bbe6a'
             'b875f928546aee7855cb1db9afc8ab3f1a8a34d43de5bbd62f7076d7ba9f3917'
-            '5bafb37baf608a3168abba2ab9ea174a1d0f0472f52d3222ea0a05957c997c50'
-            'cbfbcebb2957223eaa9c915780a5d0ac47c1fac70b7944f49e8ffcfe740edc53'
-            'SKIP'
-            'SKIP')
-            
-prepare() {
-	cd "Drill-$pkgver"
-	sed -i "s/0.0.0/$pkgver/g" DRILL_VERSION
-}
+            '5bafb37baf608a3168abba2ab9ea174a1d0f0472f52d3222ea0a05957c997c50')
 
 build() {
-    # add local dependencies to search path
-    dub add-local datefmt
-    dub add-local gtkd
-    
-    cd "Drill-$pkgver/Source/Frontend/CLI"
-    dub build \
-    	--cache=local `# ensure dub stays outside the users home directory`\
-    	--parallel `# runs multiple compiler instances in parallel, if possible`\
-    	--force `# Forces a recompilation even if the target is up to date`\
-    	--build=release
-
-	cd .. && cd GTK
-    dub build \
-    	--cache=local `# ensure dub stays outside the users home directory`\
-    	--parallel `# Runs multiple compiler instances in parallel, if possible`\
-    	--force `# Forces a recompilation even if the target is up to date:`\
-    	--build=release
-
-    # remove local dependencies from search path so dub won't find them
-    # again later
-    dub remove-local "$srcdir/datefmt"
-    dub remove-local "$srcdir/gtkd"
+    cd "Drill-$pkgver"
+    dub build --parallel -b release -c CLI
+    dub build --parallel -b release -c GTK
+}
 
-    # removes any cached metadata like the list of available packages
-    # and their latest version
-    dub clean-caches
+check() {
+    cd "Drill-$pkgver"
+    dub test --parallel
 }
 
 package_drill-search-cli() {
 	pkgdesc="Search files without indexing, but clever crawling (CLI version)"
 
-	cd "Drill-$pkgver/Source/Frontend/CLI"
+	cd "Drill-$pkgver/Build/Drill-CLI-linux-$arch-release"
 	install -d $pkgdir/{opt/$pkgname,usr/bin}
-	cp -r Build/Drill-CLI-linux-$arch-release/Assets \
-		$pkgdir/opt/$pkgname
-	install -Dm755 Build/Drill-CLI-linux-$arch-release/$pkgname \
-		$pkgdir/opt/$pkgname/$pkgname
+	cp -r Assets $pkgdir/opt/$pkgname
+	install -Dm755 $pkgname $pkgdir/opt/$pkgname/$pkgname
 	install -Dm755 $srcdir/$pkgbase $pkgdir/usr/bin/$pkgname
 	echo "/opt/$pkgname/$pkgname" "\$@" >> $pkgdir/usr/bin/$pkgname
 }
@@ -75,16 +41,13 @@ package_drill-search-gtk() {
 	pkgdesc="Search files without indexing, but clever crawling (GTK version)"
 	depends=('gtk3' 'xdg-utils')
 
-	cd "Drill-$pkgver/Source/Frontend/GTK"
+	cd "Drill-$pkgver/Build/Drill-GTK-linux-$arch-release"
 	install -d $pkgdir/{opt/$pkgname,usr/bin}
-	cp -r Build/Drill-GTK-linux-$arch-release/Assets \
-		$pkgdir/opt/$pkgname
-	install -Dm644 $srcdir/$pkgname.desktop \
-		$pkgdir/usr/share/applications/$pkgname.desktop
-	install -Dm644 $srcdir/$pkgname.svg \
-		$pkgdir/usr/share/pixmaps/$pkgname.svg
-	install -Dm755 Build/Drill-GTK-linux-$arch-release/$pkgname \
-		$pkgdir/opt/$pkgname/$pkgname
+	cp -r Assets $pkgdir/opt/$pkgname
+	install -Dm755 $pkgname $pkgdir/opt/$pkgname/$pkgname
 	install -Dm755 $srcdir/$pkgbase $pkgdir/usr/bin/$pkgname
 	echo "/opt/$pkgname/$pkgname" "\$@" >> $pkgdir/usr/bin/$pkgname
+	install -Dm644 Assets/icon.svg $pkgdir/usr/share/pixmaps/$pkgname.svg
+	install -Dm644 $srcdir/$pkgname.desktop \
+		$pkgdir/usr/share/applications/$pkgname.desktop
 }
diff --git a/drill-search-gtk.svg b/drill-search-gtk.svg
deleted file mode 100644
index 945aa5452007..000000000000
--- a/drill-search-gtk.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" standalone="no"?>

-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"

- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">

-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"

- width="512.000000pt" height="512.000000pt" viewBox="0 0 512.000000 512.000000"

- preserveAspectRatio="xMidYMid meet">

-<metadata>

-Created by potrace 1.15, written by Peter Selinger 2001-2017

-</metadata>

-<rect width="100%" height="100%" fill="white"/>

-<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"

-fill="#000000" stroke="none">

-<path d="M1436 4411 c-3 -4 -3 -142 1 -305 l6 -296 58 0 c50 0 61 -3 72 -22 8

--13 44 -116 81 -230 37 -114 71 -210 77 -214 5 -3 15 -1 22 4 7 5 80 40 162

-77 513 230 667 301 749 342 84 43 99 47 191 54 166 12 156 3 -140 -131 -88

--39 -187 -84 -220 -100 -33 -16 -166 -76 -295 -135 -346 -157 -440 -203 -440

--213 0 -10 105 -332 120 -367 4 -11 15 -45 24 -75 26 -86 26 -86 82 -65 27 10

-108 47 181 82 73 34 135 63 137 63 2 0 64 29 138 63 73 35 171 81 218 102 252

-112 522 236 666 305 119 57 120 59 133 102 26 91 73 246 95 308 21 62 24 65

-57 68 19 1 44 5 57 7 l22 5 0 290 0 290 -1124 0 c-619 0 -1127 -4 -1130 -9z"/>

-<path d="M3290 3234 c-52 -25 -126 -59 -165 -76 -38 -17 -101 -45 -140 -63

--38 -18 -99 -46 -135 -63 -36 -16 -123 -57 -195 -90 -71 -34 -254 -117 -405

--186 -151 -69 -276 -129 -278 -135 -3 -10 156 -501 167 -514 4 -4 32 5 62 19

-80 39 295 138 454 209 77 34 174 78 215 97 41 19 109 50 150 69 132 59 174 85

-181 110 15 51 89 289 119 384 18 55 36 114 40 130 5 17 16 55 24 85 8 30 12

-58 8 61 -4 4 -50 -13 -102 -37z"/>

-<path d="M3065 2424 c-42 -20 -272 -125 -468 -213 -27 -12 -94 -44 -150 -70

--56 -27 -136 -63 -177 -81 -110 -47 -108 -42 -71 -151 18 -52 47 -142 67 -201

-19 -59 39 -110 44 -113 9 -6 89 29 380 165 96 45 200 93 230 107 30 14 56 26

-57 27 3 2 115 367 138 446 7 25 18 58 24 73 6 16 11 30 11 33 0 10 -39 1 -85

--22z"/>

-<path d="M2878 1750 c-20 -11 -112 -54 -205 -96 -252 -114 -333 -153 -333

--160 0 -9 102 -318 106 -323 3 -3 21 1 41 9 34 12 268 119 303 139 8 4 27 43

-41 87 33 98 101 324 103 343 2 22 -16 22 -56 1z"/>

-<path d="M2610 1141 c-69 -31 -126 -64 -128 -72 -3 -20 112 -362 124 -366 5

--2 16 18 23 44 8 27 20 68 27 93 20 69 101 323 109 343 12 29 -21 20 -155 -42z"/>

-</g>

-</svg>

diff --git a/drill-search.install b/drill-search.install
index 7c7869785741..4b54e64f900f 100644
--- a/drill-search.install
+++ b/drill-search.install
@@ -1,13 +1,9 @@
-post_install() {
-	echo "**************************************************"
-	echo "==> Remove obsolete dub package cache files:      "
-	echo "    rm -rf ~/.dub/packages/{datefmt-*,gtk-d-*}    "    
-	echo "**************************************************"
-}
-
 post_upgrade() {
 	# Only show information if upgrading from 1.253 or older
 	if [ $(vercmp $2 1.253-1) -le 0 ]; then
-		post_install
+		echo "**************************************************"
+		echo "==> Remove obsolete dub package cache files:      "
+		echo "    rm -rf ~/.dub/packages/{datefmt-*,gtk-d-*}    "    
+		echo "**************************************************"
 	fi
 }