chore(dub): use new 3.1 openssl in requests

Signed-off-by: Luís Ferreira <contact@lsferreira.net>

3 files changed, 43 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5b04c594b76..2f54713cd56a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = serve-d-git
 	pkgdesc = Microsoft language server protocol implementation for D using workspace-d
 	pkgver = r911.172f231
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Pure-D/serve-d
 	arch = i686
 	arch = x86_64
 	groups = dlang
 	license = MIT
-	makedepends = dmd
+	makedepends = ldc
+	makedepends = lld
+	makedepends = clang
 	makedepends = git
 	makedepends = dub
 	makedepends = dtools
@@ -19,6 +21,10 @@ pkgbase = serve-d-git
 	provides = serve-d
 	conflicts = serve-d
 	source = git+https://github.com/Pure-D/serve-d
+	source = git+https://github.com/ljmf00/dlang-requests#branch=support-3.1
+	source = dub.selections.json
 	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = 44544b5310231f761e4457be3d8d00c82eceeab3ba6bfe8a11674247e688b712
 
 pkgname = serve-d-git
diff --git a/PKGBUILD b/PKGBUILD
index ee1fa69d7917..bf8a6161b3f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,36 +2,51 @@
 
 pkgname=('serve-d-git')
 pkgver=r911.172f231
-pkgrel=1
+pkgrel=2
 pkgdesc="Microsoft language server protocol implementation for D using workspace-d"
 arch=('i686' 'x86_64')
 url="https://github.com/Pure-D/serve-d"
 license=("MIT")
 groups=('dlang')
-makedepends=('dmd' 'git' 'dub' 'dtools')
+makedepends=('ldc' 'lld' 'clang' 'git' 'dub' 'dtools')
 depends=('libphobos' 'dub' 'dcd' 'dfmt' 'dscanner')
 provides=('serve-d')
 conflicts=('serve-d')
 
 source=(
-	"git+https://github.com/Pure-D/serve-d"
+    "git+https://github.com/Pure-D/serve-d"
+    "git+https://github.com/ljmf00/dlang-requests#branch=support-3.1"
+    "dub.selections.json"
 )
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            'SKIP'
+            '44544b5310231f761e4457be3d8d00c82eceeab3ba6bfe8a11674247e688b712')
+
+prepare() {
+    cd "$srcdir/dlang-requests"
+    dub add-local "$PWD" ~support-3.1
+
+    cd "$srcdir/serve-d"
+    cp ../dub.selections.json .
+
+    dub fetch dscanner@~master
+    dub upgrade -s --missing-only
+}
 
 pkgver() {
-	cd "$srcdir/serve-d"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd "$srcdir/serve-d"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-	cd "$srcdir/serve-d"
-	dub build
+    cd "$srcdir/serve-d"
+    DFLAGS="--release --boundscheck=off -O3 --linker=lld --gcc=clang --flto=full --link-defaultlib-shared=false -L--build-id" dub build --compiler=ldc
 }
 
 package() {
-	# binaries
-	install -Dm755 "$srcdir/serve-d/serve-d" "$pkgdir/usr/bin/serve-d"
+    # binaries
+    install -Dm755 "$srcdir/serve-d/serve-d" "$pkgdir/usr/bin/serve-d"
 
-	# license
-	install -Dm644 "$srcdir/serve-d/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    # license
+    install -Dm644 "$srcdir/serve-d/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/dub.selections.json b/dub.selections.json
new file mode 100644
index 000000000000..6cbce8191b3a
--- /dev/null
+++ b/dub.selections.json
@@ -0,0 +1,8 @@
+{
+	"fileVersion": 1,
+	"versions": {
+		"dscanner": "~master",
+		"requests": "~support-3.1",
+		"libdparse": "0.23.0"
+	}
+}