Adjustments.

giantpinkrobots · Nov 23, 2023 · 60db8c4 · 60db8c4
1 parent 43393b3
commit 60db8c4
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 108 deletions.
diff --git a/dependencies/aria2c-amd64/aria2c b/dependencies/aria2c-amd64/aria2c
diff --git a/dependencies/aria2c-arm64/aria2c b/dependencies/aria2c-arm64/aria2c
diff --git a/dependencies/libaria2-amd64/libaria2.so.0 b/dependencies/libaria2-amd64/libaria2.so.0
diff --git a/dependencies/libaria2-amd64/libaria2.so.0.0.0 b/dependencies/libaria2-amd64/libaria2.so.0.0.0
diff --git a/dependencies/libaria2-arm64/libaria2.so.0 b/dependencies/libaria2-arm64/libaria2.so.0
diff --git a/dependencies/libaria2-arm64/libaria2.so.0.0.0 b/dependencies/libaria2-arm64/libaria2.so.0.0.0
diff --git a/dependencies/libc-ares2-amd64/libcares.so.2 b/dependencies/libc-ares2-amd64/libcares.so.2
diff --git a/dependencies/libc-ares2-amd64/libcares.so.2.6.1 b/dependencies/libc-ares2-amd64/libcares.so.2.6.1
diff --git a/dependencies/libc-ares2-arm64/libcares.so.2 b/dependencies/libc-ares2-arm64/libcares.so.2
diff --git a/dependencies/libc-ares2-arm64/libcares.so.2.6.1 b/dependencies/libc-ares2-arm64/libcares.so.2.6.1
diff --git a/dependencies/libssh2-amd64/libssh2.so.1 b/dependencies/libssh2-amd64/libssh2.so.1
diff --git a/dependencies/libssh2-amd64/libssh2.so.1.0.1 b/dependencies/libssh2-amd64/libssh2.so.1.0.1
diff --git a/dependencies/libssh2-arm64/libssh2.so.1 b/dependencies/libssh2-arm64/libssh2.so.1
diff --git a/dependencies/libssh2-arm64/libssh2.so.1.0.1 b/dependencies/libssh2-arm64/libssh2.so.1.0.1
diff --git a/dependencies_information/ARIA2/ARIA2 SOURCE CODE.zip b/dependencies_information/ARIA2/ARIA2 SOURCE CODE.zip
diff --git a/dependencies_information/LIBC-ARES2/LICENSE.c-ares b/dependencies_information/LIBC-ARES2/LICENSE.c-ares
diff --git a/dependencies_information/LIBSSH2/LICENSE.libssh2 b/dependencies_information/LIBSSH2/LICENSE.libssh2
diff --git a/io.github.giantpinkrobots.varia.json b/io.github.giantpinkrobots.varia.json
@@ -24,59 +24,24 @@
         "*.a"
     ],
     "modules" : [
-    	"./dependencies/python3-aria2p.json",
+    	"./python3-aria2p.json",
 	{
-            "name" : "aria2",
-            "only-arches": ["x86_64"],
-            "buildsystem" : "simple",
-            "build-commands": [
-            	"mkdir /app/aria2",
-            	"install -D ./dependencies/aria2c-amd64/* /app/aria2",
-            	"install -D ./dependencies/libaria2-amd64/* /app/lib",
-            	"install -D ./dependencies/libssh2-amd64/* /app/lib",
-            	"install -D ./dependencies/libc-ares2-amd64/* /app/lib"
-	    ],
-            "sources" : [
-                {
-                    "type" : "dir",
-                    "path" : "./"
-                }
-            ]
-        },
-        {
-            "name" : "aria2",
-            "only-arches": ["aarch64"],
-            "buildsystem" : "simple",
-            "build-commands": [
-            	"mkdir /app/aria2",
-            	"install -D ./dependencies/aria2c-arm64/* /app/aria2",
-            	"install -D ./dependencies/libaria2-arm64/* /app/lib",
-            	"install -D ./dependencies/libssh2-arm64/* /app/lib",
-            	"install -D ./dependencies/libc-ares2-arm64/* /app/lib"
-	    ],
-            "sources" : [
-                {
-                    "type" : "dir",
-                    "path" : "./"
-                }
-            ]
-        },
-        {
-            "name" : "dependencies_information",
-            "buildsystem" : "simple",
-            "build-commands": [
-            	"install -d /app/dependencies_information",
-            	"install -d /app/dependencies_information/ARIA2",
-            	"install -d /app/dependencies_information/ARIA2P",
-            	"install -d ./dependencies_information/* /app/dependencies_information"
-	    ],
-            "sources" : [
+	   "name" : "aria2",
+	   "buildsystem" : "simple",
+	   "build-commands" : [
+	   	"mkdir /app/aria2/",
+		"./configure --without-libxml2 --without-libexpat --without-sqlite3 --without-appletls --without-gnutls --without-libgmp --without-libnettle --without-libgcrypt --without-libssh2 --without-cppunit --without-libz --without-libcunit --without-libssl --without-libuv --without-libcares --without-libaria2 --disable-nls --with-openssl --disable-bittorrent --disable-ftp",
+	   	"make",
+	   	"install -Dm755 src/aria2c /app/aria2/"
+	   ],
+	   "sources" : [
                 {
-                    "type" : "dir",
-                    "path" : "./"
+                    "type" : "archive",
+                    "url" : "https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0.tar.xz",
+                    "sha256" : "1e2b7fd08d6af228856e51c07173cfcf987528f1ac97e04c5af4a47642617dfd"
                 }
             ]
-        },
+	},
         {
             "name" : "varia",
             "builddir" : true,

diff --git a/meson.build b/meson.build
@@ -4,6 +4,9 @@ project('varia',
   default_options: [ 'warning_level=2', 'werror=false', ],
 )
 
+pkgdatadir = get_option('prefix') / get_option('datadir') / meson.project_name()
+moduledir = pkgdatadir / 'varia'
+
 i18n = import('i18n')
 gnome = import('gnome')
 
@@ -13,6 +16,8 @@ subdir('data')
 subdir('src')
 subdir('po')
 
+install_subdir('dependencies_information', install_dir: moduledir)
+
 gnome.post_install(
      glib_compile_schemas: true,
     gtk_update_icon_cache: true,

diff --git a/dependencies/python3-aria2p.json → python3-aria2p.json b/dependencies/python3-aria2p.json → python3-aria2p.json
diff --git a/src/variamain.py b/src/variamain.py
@@ -440,7 +440,7 @@ def show_about(self, app):
         dialog.set_comments("aria2 based download manager utilizing GTK4 and Libadwaita.")
         dialog.set_website("https://github.com/giantpinkrobots/varia")
         dialog.set_issue_url("https://github.com/giantpinkrobots/varia/issues")
-        dialog.set_copyright("2023 Giant Pink Robots!\n\nThis application relies on the following pieces of software:\n\n- aria2: GPL v2 License (aria2 itself relies on OpenSSL: OpenSSL License)\n- aria2p: ISC License\n- c-ares: MIT License\n- libssh2: BSD-3-Clause License\n\nThe licenses of all of these pieces of software can be found in the dependencies_information directory in this application's app directory. A copy of aria2's source code has also been provided in that same directory in order to comply with GPL v2.")
+        dialog.set_copyright("2023 Giant Pink Robots!\n\nThis application relies on the following pieces of software:\n\n- aria2: GPL v2 License (aria2 itself relies on OpenSSL: OpenSSL License)\n- aria2p: ISC License\n\nThe licenses of all of these pieces of software can be found in the dependencies_information directory in this application's app directory.")
         dialog.set_developers(["Giant Pink Robots! (@giantpinkrobots) https://github.com/giantpinkrobots"])
         dialog.set_application_icon("io.github.giantpinkrobots.varia")
         dialog.set_translator_credits("")