feat: add support of zip source archives

Signed-off-by: sisungo <[email protected]>

lib/sources.py

@@ -4,6 +4,7 @@ import sys
 import tarfile
 import urllib.parse
 import urllib.request
+import zipfile
 
 
 def filename(url):
@@ -128,6 +129,25 @@ def tar_common_root(tar: tarfile.TarFile) -> str | None:
     return root
 
 
+def zip_common_root(zip_file: zipfile.ZipFile) -> str | None:
+    members = zip_file.infolist()
+    if not members:
+        return None
+    root = None
+    for member in members:
+        path = member.filename.replace('\\', '/').lstrip('./').lstrip('/')
+        if not path:
+            continue
+        this_root = path.split('/')[0]
+        if this_root in ('', '.', '..'):
+            continue
+        if root is None:
+            root = this_root
+        elif this_root != root:
+            return None
+    return root
+
+
 def sources_dir_name() -> str:
     with open("./target/sources.tag") as file:
         return file.read()
@@ -139,16 +159,28 @@ def source_url(url: str):
     download_path = f"./target/{filename(url)}"
     download(url, download_path)
 
-    with tarfile.open(download_path, "r") as tar:
-        common_root = tar_common_root(tar)
-        extract_dir = "./target"
-        sources_dir = f"./target/{common_root}"
-        if common_root in ["", ".", "None"]:
-            extract_dir = "./target/sources"
-            sources_dir = "./target/sources"
-        tar.extractall(extract_dir)
-        with open("./target/sources.tag", "wt+") as file:
-            file.write(sources_dir)
+    if download_path.endswith(".zip"):
+        with zipfile.ZipFile(download_path, "r") as zip:
+            common_root = zip_common_root(zip)
+    else:
+        with tarfile.open(download_path, "r") as tar:
+            common_root = tar_common_root(tar)
+
+    extract_dir = "./target"
+    sources_dir = f"./target/{common_root}"
+    if common_root in ["", ".", None]:
+        extract_dir = "./target/sources"
+        sources_dir = "./target/sources"
+
+    if download_path.endswith(".zip"):
+        with zipfile.ZipFile(download_path, "r") as zip:
+            zip.extractall(extract_dir)
+    else:
+        with tarfile.open(download_path, "r") as tar:
+            tar.extractall(extract_dir)
+
+    with open("./target/sources.tag", "wt+") as file:
+        file.write(sources_dir)
 
 
 def _git_repo_name(url: str) -> str:

packages/libpng/pkgbuild.py

@@ -1,56 +0,0 @@
-from lib import cpp, arch
-from lib.make import *
-
-
-version("1.6.58")
-description("the official PNG reference library")
-maintainer("sisungo <[email protected]>")
-source_url("https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.58.tar.gz")
-
-builddep("shortcut/c")
-builddep("shortcut/autotools")
-builddep(f"libz-ng-dev @{arch.get_target()}")
-
-
-def build():
-    cpp.configure([
-        f"--libdir={get_prefix('libpng')}/lib",
-        f"--includedir={get_prefix('libpng')}/include",
-        "--enable-hardware-optimizations=on",
-    ])
-    cpp.make()
-    cpp.make_install()
-
-on_build(build)
-
-
-def pack_tools(composer):
-    composer.makedir("bin")
-    composer.addfile("bin/png-fix-itxt", "bin/png-fix-itxt")
-    composer.addfile("bin/pngfix", "bin/pngfix")
-
-def pack_dev(composer):
-    composer.makedir("lib")
-    composer.addfile("lib/libpng.a", "lib/libpng.a")
-    composer.addfile("lib/libpng.la", "lib/libpng.la")
-    composer.addfile("lib/libpng16.a", "lib/libpng16.a")
-    composer.addfile("lib/libpng16.la", "lib/libpng16.la")
-    composer.add_dir("lib/pkgconfig", "lib/pkgconfig")
-    composer.makedir("bin")
-    composer.addfile("bin/libpng-config", "bin/libpng-config")
-    composer.addfile("bin/libpng16-config", "bin/libpng16-config")
-    composer.add_dir("include", "include")
-
-
-package("libpng")
-dep("libz @same-arch")
-cpp.use_auto_pack(["lib"])
-
-package("libpng-tools")
-dep("libpng (same)")
-on_pack(pack_tools)
-
-package("libpng-dev")
-dep("libpng (same)")
-dep("libz-dev @same-arch")
-on_pack(pack_dev)

x.py

@@ -119,6 +119,7 @@ def cmd_build_package(package: str):
             "version": pkgver,
             "arch": pkgarch,
             "description": pkginfo[lib.make._key_description],
+            "maintainers": pkginfo[lib.make._key_maintainers],
             "dependencies": pkginfo[lib.make._key_dependencies],
             "provides": pkginfo[lib.make._key_provides],
             "recommendations": pkginfo[lib.make._key_recommendations],