feat: fix glib include path

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

lib/sources.py

@@ -4,7 +4,6 @@ import sys
 import tarfile
 import urllib.parse
 import urllib.request
-import zipfile
 
 
 def filename(url):
@@ -129,25 +128,6 @@ 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()
@@ -159,28 +139,16 @@ def source_url(url: str):
     download_path = f"./target/{filename(url)}"
     download(url, download_path)
 
-    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)
+    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)
 
 
 def _git_repo_name(url: str) -> str:

packages/glib/pkgbuild.py

@@ -31,7 +31,7 @@ def build():
         f"-Dgio_module_dir=/lib/{arch.get_target()}/gio/modules",
         "--prefix=/",
         f"--bindir={get_prefix('glib-tools')}/bin",
-        f"--libdir={get_prefix('glib')}/lib",
+        f"--libdir={get_prefix('glib-dev')}/lib",
         f"--includedir={get_prefix('glib-dev')}/include",
         f"--libexecdir={get_prefix('libglib')}/libexec",
         f"--datadir={get_prefix('glib')}/share",

x.py

@@ -119,7 +119,6 @@ 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],