From ca72ca55bdfbc60165329aad5b66ada61471cd10 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Mon, 13 Apr 2020 13:48:04 +0300
Subject: Add singleapplication.wrap

Remove SingleApplication git submodule
---
 .gitmodules                                       |  3 ---
 3rd-party/SingleApplication/SingleApplication.git |  1 -
 3rd-party/SingleApplication/meson.build           | 23 -----------------------
 linux/makepkg/PKGBUILD                            | 15 ++++++++-------
 meson.build                                       |  2 +-
 subprojects/singleapplication.wrap                |  6 ++++++
 6 files changed, 15 insertions(+), 35 deletions(-)
 delete mode 160000 3rd-party/SingleApplication/SingleApplication.git
 delete mode 100644 3rd-party/SingleApplication/meson.build
 create mode 100644 subprojects/singleapplication.wrap

diff --git a/.gitmodules b/.gitmodules
index 15a621a..d0be9f6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "3rd-party/SingleApplication/SingleApplication.git"]
-	path = 3rd-party/SingleApplication/SingleApplication.git
-	url = https://library.iserlohn-fortress.net/aqua/SingleApplication.git
 [submodule "3rd-party/args/args.git"]
 	path = 3rd-party/args/args.git
 	url = https://github.com/Taywee/args
diff --git a/3rd-party/SingleApplication/SingleApplication.git b/3rd-party/SingleApplication/SingleApplication.git
deleted file mode 160000
index e10a2e3..0000000
--- a/3rd-party/SingleApplication/SingleApplication.git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e10a2e3795319dfdf2f5685e27fce00a2d0c0306
diff --git a/3rd-party/SingleApplication/meson.build b/3rd-party/SingleApplication/meson.build
deleted file mode 100644
index f1c13fc..0000000
--- a/3rd-party/SingleApplication/meson.build
+++ /dev/null
@@ -1,23 +0,0 @@
-SingleApplication_inc = include_directories('SingleApplication.git')
-
-SingleApplication_moc = mod_qt5.preprocess(
-    moc_headers: ['SingleApplication.git/singleapplication.h', 'SingleApplication.git/singleapplication_p.h'],
-    moc_extra_arguments: ['-DQAPPLICATION_CLASS=QApplication'],
-    dependencies: dep_qt5
-)
-
-SingleApplication_lib = static_library('SingleApplication', 
-    ['SingleApplication.git/singleapplication.cpp', 'SingleApplication.git/singleapplication_p.cpp', SingleApplication_moc],
-    include_directories: SingleApplication_inc,
-    cpp_args : '-DQAPPLICATION_CLASS=QApplication',
-    dependencies: dep_qt5
-)
-
-dep_SingleApplication = declare_dependency(
-    include_directories: SingleApplication_inc,
-    link_with: SingleApplication_lib
-).as_system('system')
-
-# On windows, SingleApplication needs to be linked against advapi32. This is
-# done by adding 'advapi32' to cpp_winlibs, where it should be by default.
-
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index 3f10589..78549c3 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -33,21 +33,22 @@ 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"
-        "git+https://library.iserlohn-fortress.net/aqua/SingleApplication.git"
+        "https://neueland.iserlohn-fortress.net/releases/SingleApplication-3.1.1a.tar.xz"{,.sig}
         "git+https://github.com/Taywee/args")
 
-sha512sums=('SKIP'
-            'SKIP'
-            'SKIP')
+b2sums=('SKIP'
+        'cec3de8dbf252bfa6dc488e5a1440695f4dd3abffdf30948b7d1a3df3d9c85911e981c802ed5a882f1407315114529f4016e55c7d05fbbd1dafe5495b0a63f4a'
+        'SKIP'
+        'SKIP')
 
-#validgpgkeys=(BB1C090188E3E32B375C13FD095DE26BC16D2E98) # Aqua-sama <aqua@iserlohn-fortress.net>
+validgpgkeys=(BB1C090188E3E32B375C13FD095DE26BC16D2E98) # Aqua-sama <aqua@iserlohn-fortress.net>
 
 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/SingleApplication/SingleApplication.git.url $srcdir/SingleApplication
-    git submodule update 3rd-party/SingleApplication/SingleApplication.git
     git config submodule.3rd-party/args/args.git.url $srcdir/args
     git submodule update 3rd-party/args/args.git
 }
diff --git a/meson.build b/meson.build
index 08899fc..003d312 100644
--- a/meson.build
+++ b/meson.build
@@ -65,6 +65,7 @@ if dep_breakpad.found()
 endif
 
 dep_gtest = dependency('gtest', required: false, disabler: true)
+dep_SingleApplication = dependency('singleapplication', fallback: [ 'singleapplication', 'SingleApplication_dep' ])
 
 # Generate config header
 include = include_directories('include')
@@ -80,7 +81,6 @@ subdir('lib/downloads')
 subdir('lib/pluginloader')
 subdir('lib/urlfilter')
 
-subdir('3rd-party/SingleApplication')
 subdir('3rd-party/args')
 
 subdir('src')
diff --git a/subprojects/singleapplication.wrap b/subprojects/singleapplication.wrap
new file mode 100644
index 0000000..ac817db
--- /dev/null
+++ b/subprojects/singleapplication.wrap
@@ -0,0 +1,6 @@
+[wrap-file]
+directory = SingleApplication-3.1.1a
+
+source_url = https://neueland.iserlohn-fortress.net/releases/SingleApplication-3.1.1a.tar.xz
+source_filename = SingleApplication-3.1.1a.tar.xz
+source_hash = df21800c9f3b254048ed34f6cfe96e5a540dc8ab4533b327a6982a6030f77080
-- 
cgit v1.2.1