Merge branch 'v1.17-dev'

2020-11-26 02:41:08 -08:00 · 2020-11-26 02:41:08 -08:00 · 98dea9aeac
parent 9c4ebaa238 127b91a217
commit 98dea9aeac
1 changed files with 6 additions and 6 deletions
--- a/flatpak/io.github.qtox.qTox.json
+++ b/flatpak/io.github.qtox.qTox.json
@ -45,11 +45,7 @@
            "build-options": {
                "no-debuginfo": true
            },
-            "cleanup": [
-                "/bin",
-                "/lib",
-                "/man"
-            ],
+            "cleanup": [ '*' ],
            "sources": [
                {
                    "type": "archive",
@ -107,7 +103,11 @@
        {
            "name": "c-toxcore",
            "buildsystem": "cmake-ninja",
-            "config-opts": ["-DBOOTSTRAP_DAEMON=OFF"],
+            "config-opts": [
+                "-DDHT_BOOTSTRAP=OFF",
+                "-DBOOTSTRAP_DAEMON=OFF",
+                "-DENABLE_STATIC=OFF"
+            ],
            "sources": [
                {
                    "type": "git",