From 5d90c26248c43c3aa54aaaaa3f5bd0f8db443e9f Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sat, 10 Aug 2024 12:57:39 -0500 Subject: [PATCH] audacious: add v4.3.1, v4.4 (support Qt6) --- .../builtin/packages/audacious/package.py | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/audacious/package.py b/var/spack/repos/builtin/packages/audacious/package.py index 2ee953de775..2362c4506e4 100644 --- a/var/spack/repos/builtin/packages/audacious/package.py +++ b/var/spack/repos/builtin/packages/audacious/package.py @@ -13,14 +13,16 @@ class Audacious(AutotoolsPackage): license("BSD-2-Clause AND BSD-3-Clause", checked_by="tgamblin") + version("4.4", sha256="b240567c9b4452339fbee63503284d9c7f443f4f08c3ec0221d9e8738337a55e") + version("4.3.1", sha256="ee920bf22fb54ec91f2ff3c8821d6f8e7dacca72fdb6bacf626868c087e77088") version("4.0.2", sha256="92f30a78353c50f99b536061b9d94b6b9128760d546fddbf863e3591c4ac5a8d") version("4.0.1", sha256="203195cf0d3c2e40d23c9895269ca0ace639c4a2b4dceb624169d75337059985") version("4.0", sha256="cdfffd0eb966856980328ebb0fff9cbce57f99db9bda15e7e839d26c89e953e6") version("3.10.1", sha256="c478939b4bcf6704c26eee87d48cab26547e92a83741f437711178c433373fa1") version("3.10", sha256="82710d6ac90931c2cc4a0f0fcb6380ac21ed42a7a50856d16a67d3179a96e9ae") - depends_on("c", type="build") # generated - depends_on("cxx", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") depends_on("m4", type="build") depends_on("autoconf", type="build") @@ -29,13 +31,28 @@ class Audacious(AutotoolsPackage): depends_on("gettext") depends_on("iconv", type="link") depends_on("glib") - depends_on("qt") + depends_on("qt", when="@:4.3") + depends_on("qmake", when="@4.4:") + with when("^[virtuals=qmake] qt"): + depends_on("qt") + with when("^[virtuals=qmake] qt-base"): + depends_on("qt-base +gui +widgets") + depends_on("qt-svg") def patch(self): - search_path_args = " ".join(self.autoreconf_search_path_args) + search_path_args = " ".join(self.builder.autoreconf_search_path_args) search_path_str = f"-I m4 {search_path_args}" filter_file("-I m4", search_path_str, "autogen.sh") def autoreconf(self, spec, prefix): bash = which("bash") bash("./autogen.sh") + + def configure_args(self): + args = [] + args.append("--disable-gtk") + if self.spec.satisfies("^[virtuals=qmake] qt-base"): + args.append("--disable-qt5") + else: + args.append("--enable-qt5") + return args