diff --git a/util/archive/zziplib/actions.py b/util/archive/zziplib/actions.py index b18ee88ce0..f4239cecae 100644 --- a/util/archive/zziplib/actions.py +++ b/util/archive/zziplib/actions.py @@ -4,28 +4,24 @@ # Licensed under the GNU General Public License, version 3. # See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import shelltools from pisi.actionsapi import cmaketools +from pisi.actionsapi import mesontools from pisi.actionsapi import pisitools -from pisi.actionsapi import get - -shelltools.export("JOBS", get.makeJOBS().replace("-j5", "-j1")) j = ''.join([ - '-DCMAKE_BUILD_TYPE=Release ', - '-DCMAKE_INSTALL_LIBDIR=lib ', + ' -DCMAKE_BUILD_TYPE=Release', + ' -DCMAKE_INSTALL_LIBDIR=lib', + ' -Bbuild -G Ninja -L ' ]) def setup(): - shelltools.makedirs("build") - shelltools.cd("build") - cmaketools.configure("%s -G Ninja -L" % j, sourceDir = '..') + cmaketools.configure(j) def build(): - shelltools.system("ninja -C build") + mesontools.build() def install(): - shelltools.system("DESTDIR=%s ninja -C build install" % get.installDIR()) + mesontools.install() pisitools.dodoc("ChangeLog", "COPYING.LIB", "README", "TODO", "docs/COPYING*", "docs/README.SDL") diff --git a/util/archive/zziplib/pspec.xml b/util/archive/zziplib/pspec.xml index 2feb2a49a9..528d5eb783 100644 --- a/util/archive/zziplib/pspec.xml +++ b/util/archive/zziplib/pspec.xml @@ -18,8 +18,8 @@ The ZZIPlib provides read access on ZIP-archives and unpacked data. It features an additional simplified API following the standard Posix API for file access. - - https://github.com/gdraheim/zziplib/archive/v0.13.72.tar.gz + + https://github.com/gdraheim/zziplib/archive/v0.13.78/zziplib-0.13.78.tar.gz cmake @@ -62,12 +62,20 @@ /usr/include - /usr/lib/pkgconfig + /usr/lib/cmake + /usr/lib/pkgconfig /usr/share/aclocal + + 2024-10-24 + 0.13.78 + Rebuild + fury + uglyside@yandex.ru + 2023-11-04 0.13.72