initial upload

6 files changed, 119 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d338b7b8b04b..a6dde07fd8a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,28 @@
 pkgbase = drill-search
-	pkgdesc = Search files without indexing, but clever crawling
-	pkgver = 1.199
+	pkgver = 1.237
 	pkgrel = 1
 	url = https://www.drill.santamorena.me/
 	arch = x86_64
 	license = GPL2
-	provides = drill-search
-	conflicts = drill-search
-	source = https://github.com/yatima1460/Drill/releases/download/1.199/Drill-ui-linux-1.199-x86_64.deb
-	md5sums = 6d7befe042e4553880bef3b3308bea11
+	makedepends = dmd
+	makedepends = dub
+	source = drill-search-1.237.tar.gz::https://github.com/yatima1460/Drill/archive/1.237.tar.gz
+	source = drill-search
+	source = drill-search-gtk.desktop
+	source = drill-search-gtk.svg
+	source = DRILL_VERSION
+	sha256sums = 95c20baadf7334ca7d32f018796f3027f892e946ac219a34c74207404c9f3e10
+	sha256sums = b875f928546aee7855cb1db9afc8ab3f1a8a34d43de5bbd62f7076d7ba9f3917
+	sha256sums = 21a6d19b8198816b3a6e406198ee6e4d5ab0da134df26b8342837e810ccc26a9
+	sha256sums = cbfbcebb2957223eaa9c915780a5d0ac47c1fac70b7944f49e8ffcfe740edc53
+	sha256sums = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 
-pkgname = drill-search
+pkgname = drill-search-cli
+	pkgdesc = Search files without indexing, but clever crawling (CLI version)
+	conflicts = drill-search-cli-bin
+
+pkgname = drill-search-gtk
+	pkgdesc = Search files without indexing, but clever crawling (GTK version)
+	depends = gtk3
+	conflicts = drill-search-gtk-bin
 
diff --git a/DRILL_VERSION b/DRILL_VERSION
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/DRILL_VERSION
diff --git a/PKGBUILD b/PKGBUILD
index 98711ac193fa..556688eb9889 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,54 @@
-# Maintainer: Juan Simón <play4pro@protonmail.com>
-
-pkgname=drill-search
-pkgver=1.199
+# Maintainer: Mark Wagie <yochanan dot marqos at gmail dot com>
+pkgname=('drill-search-cli' 'drill-search-gtk')
+pkgbase=drill-search
+pkgver=1.237
 pkgrel=1
-pkgdesc="Search files without indexing, but clever crawling"
-url="https://www.drill.santamorena.me/"
 arch=('x86_64')
+url="https://www.drill.santamorena.me/"
 license=('GPL2')
-provides=("${pkgname}")
-conflicts=("${provides[@]}")
-source=("https://github.com/yatima1460/Drill/releases/download/1.199/Drill-ui-linux-1.199-x86_64.deb")
-md5sums=('6d7befe042e4553880bef3b3308bea11')                  
+makedepends=('dmd' 'dub')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/yatima1460/Drill/archive/$pkgver.tar.gz"
+	"$pkgbase"
+	"$pkgbase-gtk.desktop"
+	"$pkgbase-gtk.svg"
+	"DRILL_VERSION")
+sha256sums=('95c20baadf7334ca7d32f018796f3027f892e946ac219a34c74207404c9f3e10'
+            'b875f928546aee7855cb1db9afc8ab3f1a8a34d43de5bbd62f7076d7ba9f3917'
+            '21a6d19b8198816b3a6e406198ee6e4d5ab0da134df26b8342837e810ccc26a9'
+            'cbfbcebb2957223eaa9c915780a5d0ac47c1fac70b7944f49e8ffcfe740edc53'
+            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855')
+
+package_drill-search-cli() {
+	pkgdesc="Search files without indexing, but clever crawling (CLI version)"
+	conflicts=("$pkgname-bin")
+
+	cd "Drill-$pkgver/Source/Frontend/CLI"
+	dub build -b release
+	
+	install -d $pkgdir/{opt/$pkgname,usr/bin}
+	cp -r Build/Drill-CLI-linux-$arch-release/Assets $pkgdir/opt/$pkgname
+	install -Dm644 $srcdir/DRILL_VERSION $pkgdir/opt/$pkgname/DRILL_VERSION
+	echo "$pkgver" >> $pkgdir/opt/$pkgname/DRILL_VERSION
+	install -Dm755 Build/Drill-CLI-linux-$arch-release/$pkgname $pkgdir/opt/$pkgname/$pkgname
+	install -Dm755 $srcdir/$pkgbase $pkgdir/usr/bin/$pkgname
+	echo "/opt/$pkgname/$pkgname" "\$@" >> $pkgdir/usr/bin/$pkgname
+}
+
+package_drill-search-gtk() {
+	pkgdesc="Search files without indexing, but clever crawling (GTK version)"
+	depends=('gtk3')
+	conflicts=("$pkgname-bin")
 
-package() {
-	bsdtar -xf data.tar.xz -C "$pkgdir"/
-	chmod -R 755 "$pkgdir"/opt "$pkgdir"/usr
+	cd "Drill-$pkgver/Source/Frontend/GTK"
+	dub build -b release
+	
+	install -d $pkgdir/{opt/$pkgname,usr/bin}
+	cp -r Build/Drill-GTK-linux-$arch-release/Assets $pkgdir/opt/$pkgname
+	install -Dm644 $srcdir/DRILL_VERSION $pkgdir/opt/$pkgname/DRILL_VERSION
+	echo "$pkgver" >> $pkgdir/opt/$pkgname/DRILL_VERSION
+	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
+	install -Dm755 $srcdir/$pkgbase $pkgdir/usr/bin/$pkgname
+	echo "/opt/$pkgname/$pkgname" "\$@" >> $pkgdir/usr/bin/$pkgname
 }
diff --git a/drill-search b/drill-search
new file mode 100644
index 000000000000..a9bf588e2f88
--- /dev/null
+++ b/drill-search
@@ -0,0 +1 @@
+#!/bin/bash
diff --git a/drill-search-gtk.desktop b/drill-search-gtk.desktop
new file mode 100644
index 000000000000..0c3041d8106b
--- /dev/null
+++ b/drill-search-gtk.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Drill
+Type=Application
+Comment=Search files without using indexing, but clever crawling
+Icon=drill-search-gtk
+Exec=/usr/bin/drill-search-gtk
+TryExec=/usr/bin/drill-search-gtk
+Terminal=false
+Categories=Application;Utility;
+Keywords=Search;FileSearch;File Search;Find;Search;
diff --git a/drill-search-gtk.svg b/drill-search-gtk.svg
new file mode 100644
index 000000000000..945aa5452007
--- /dev/null
+++ b/drill-search-gtk.svg
@@ -0,0 +1,38 @@
+<?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>