From 11350b141ab243ae08e42d46ff476e3ad172c2bd Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Wed, 15 Apr 2020 21:37:51 +0300
Subject: Add args.wrap

Remove 3rd-party/args
---
 .gitmodules                | 3 ---
 3rd-party/args/args.git    | 1 -
 3rd-party/args/meson.build | 5 -----
 linux/makepkg/PKGBUILD     | 9 +++------
 meson.build                | 3 +--
 subprojects/args.wrap      | 6 ++++++
 6 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 3rd-party/args/args.git
 delete mode 100644 3rd-party/args/meson.build
 create mode 100644 subprojects/args.wrap

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index d0be9f6..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "3rd-party/args/args.git"]
-	path = 3rd-party/args/args.git
-	url = https://github.com/Taywee/args
diff --git a/3rd-party/args/args.git b/3rd-party/args/args.git
deleted file mode 160000
index 78e27fa..0000000
--- a/3rd-party/args/args.git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 78e27faf75ff7d20f232f11ffcef65cde43c449d
diff --git a/3rd-party/args/meson.build b/3rd-party/args/meson.build
deleted file mode 100644
index 8b0c441..0000000
--- a/3rd-party/args/meson.build
+++ /dev/null
@@ -1,5 +0,0 @@
-# This is a header-only lib, all we need to do is include it
-dep_args = declare_dependency(
-  include_directories: include_directories('args.git')
-).as_system('system')
-
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index b7086ad..5e27542 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -34,11 +34,12 @@ options=(!buildflags)
 # use git+file:///path/to/your/repo to build from a local repo
 source=("git+https://library.iserlohn-fortress.net/aqua/smolbote.git"
         "https://neueland.iserlohn-fortress.net/releases/SingleApplication-3.1.1a.tar.xz"{,.sig}
-        "git+https://github.com/Taywee/args")
+        "https://neueland.iserlohn-fortress.net/releases/args.hxx-6.2.2.tar.xz"{,.sig})
 
 b2sums=('SKIP'
         'cec3de8dbf252bfa6dc488e5a1440695f4dd3abffdf30948b7d1a3df3d9c85911e981c802ed5a882f1407315114529f4016e55c7d05fbbd1dafe5495b0a63f4a'
         'SKIP'
+        '440e357006883fbf1b1a796051500a6b068858a35947cd1119767bed8e0a86a7db4aff16498934d7217c375fe643da03c22007e438f30899e247153f25c922b6'
         'SKIP')
 
 validgpgkeys=(BB1C090188E3E32B375C13FD095DE26BC16D2E98) # Aqua-sama <aqua@iserlohn-fortress.net>
@@ -46,11 +47,7 @@ validgpgkeys=(BB1C090188E3E32B375C13FD095DE26BC16D2E98) # Aqua-sama <aqua@iserlo
 prepare() {
     mkdir "$srcdir/smolbote/subprojects/packagecache/"
     ln -s "$srcdir/SingleApplication-3.1.1a" "$srcdir/smolbote/subprojects/"
-    cd $srcdir/smolbote
-
-    git submodule init
-    git config submodule.3rd-party/args/args.git.url $srcdir/args
-    git submodule update 3rd-party/args/args.git
+    ln -s "$srcdir/args.hxx-6.2.2" "$srcdir/smolbote/subprojects/"
 }
 
 pkgver() {
diff --git a/meson.build b/meson.build
index 62d517d..8db72eb 100644
--- a/meson.build
+++ b/meson.build
@@ -67,6 +67,7 @@ endif
 dep_gtest = dependency('gtest', required: false, disabler: true)
 dep_catch = dependency('catch2', required: true, fallback: ['catch2', 'catch2_dep'] )
 dep_SingleApplication = dependency('singleapplication', fallback: [ 'singleapplication', 'SingleApplication_dep' ])
+dep_args = dependency('args.hxx', fallback: [ 'args', 'args_dep' ])
 
 # Generate config header
 include = include_directories('include')
@@ -83,8 +84,6 @@ subdir('lib/pluginloader')
 subdir('lib/urlfilter')
 subdir('lib/session_formats')
 
-subdir('3rd-party/args')
-
 subdir('src')
 subdir('lang')
 subdir('doc')
diff --git a/subprojects/args.wrap b/subprojects/args.wrap
new file mode 100644
index 0000000..ac19afa
--- /dev/null
+++ b/subprojects/args.wrap
@@ -0,0 +1,6 @@
+[wrap-file]
+directory = args.hxx-6.2.2
+
+source_url = https://neueland.iserlohn-fortress.net/releases/args.hxx-6.2.2.tar.xz
+source_filename = args.hxx-6.2.2.tar.xz
+source_hash = c1ed4bc76d3c343f493e6ae2c10ebcf3fdfaf013210b0a3dead04cef30c63fb6
-- 
cgit v1.2.1