From 3f173c0e1f71d96bd4a283e2553171b3dd37d7c8 Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Fri, 22 Jan 2021 08:51:34 +0000 Subject: [PATCH] zziplib version bump. --- util/archive/zziplib/actions.py | 16 +++---- .../zziplib/files/dont-build-docs.patch | 15 ------- .../files/zziplib-0.13.59-multilib.patch | 42 ------------------- util/archive/zziplib/pspec.xml | 35 ++++++++-------- 4 files changed, 25 insertions(+), 83 deletions(-) delete mode 100644 util/archive/zziplib/files/dont-build-docs.patch delete mode 100644 util/archive/zziplib/files/zziplib-0.13.59-multilib.patch diff --git a/util/archive/zziplib/actions.py b/util/archive/zziplib/actions.py index e834745a4e..b18ee88ce0 100644 --- a/util/archive/zziplib/actions.py +++ b/util/archive/zziplib/actions.py @@ -11,21 +11,21 @@ from pisi.actionsapi import get shelltools.export("JOBS", get.makeJOBS().replace("-j5", "-j1")) +j = ''.join([ + '-DCMAKE_BUILD_TYPE=Release ', + '-DCMAKE_INSTALL_LIBDIR=lib ', + ]) + def setup(): shelltools.makedirs("build") shelltools.cd("build") - cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib -L", sourceDir = '..') + cmaketools.configure("%s -G Ninja -L" % j, sourceDir = '..') def build(): - shelltools.cd("build") - cmaketools.make() - cmaketools.make("docs") + shelltools.system("ninja -C build") def install(): - shelltools.cd("build") - cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + shelltools.system("DESTDIR=%s ninja -C build install" % get.installDIR()) - pisitools.dohtml("docs/*.htm*") - shelltools.cd("..") pisitools.dodoc("ChangeLog", "COPYING.LIB", "README", "TODO", "docs/COPYING*", "docs/README.SDL") diff --git a/util/archive/zziplib/files/dont-build-docs.patch b/util/archive/zziplib/files/dont-build-docs.patch deleted file mode 100644 index 650f0f6028..0000000000 --- a/util/archive/zziplib/files/dont-build-docs.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: zziplib-0.13.59/Makefile.in -=================================================================== ---- zziplib-0.13.59.orig/Makefile.in -+++ zziplib-0.13.59/Makefile.in -@@ -279,8 +279,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign dist-bzip - ACLOCAL_AMFLAGS = -I m4 - WANT_AUTOMAKE = 1.7 - WANT_AUTOCONF = 2.57 --DIST_SUBDIRS = zzip zzipwrap bins test docs SDL --SUBDIRS = zzip zzipwrap bins test docs @SDL@ -+DIST_SUBDIRS = zzip zzipwrap bins test SDL -+SUBDIRS = zzip zzipwrap bins test @SDL@ - OSC_ROOT = /my/own/osc - OSC_SRCDIR = $(OSC_ROOT) - OSC_PROJECT = home:guidod:zziplib-13 diff --git a/util/archive/zziplib/files/zziplib-0.13.59-multilib.patch b/util/archive/zziplib/files/zziplib-0.13.59-multilib.patch deleted file mode 100644 index f4b7a985d6..0000000000 --- a/util/archive/zziplib/files/zziplib-0.13.59-multilib.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naupr zziplib-0.13.59.orig/zzip/_config.h zziplib-0.13.59/zzip/_config.h ---- zziplib-0.13.59.orig/zzip/_config.h 2010-02-14 22:29:34.000000000 +0100 -+++ zziplib-0.13.59/zzip/_config.h 2010-12-04 16:22:19.809534085 +0100 -@@ -133,7 +133,11 @@ - - /* whether the system defaults to 32bit off_t but can do 64bit when requested - */ --/* #undef LARGEFILE_SENSITIVE */ -+#if __WORDSIZE == 32 -+#ifndef ZZIP_LARGEFILE_SENSITIVE -+#define ZZIP_LARGEFILE_SENSITIVE 1 -+#endif -+#endif - - /* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -@@ -178,8 +181,12 @@ - - /* The number of bytes in type long */ - #ifndef ZZIP_SIZEOF_LONG -+#if __WORDSIZE == 32 -+#define ZZIP_SIZEOF_LONG 4 -+#elif __WORDSIZE == 64 - #define ZZIP_SIZEOF_LONG 8 - #endif -+#endif - - /* The number of bytes in type short */ - #ifndef ZZIP_SIZEOF_SHORT -@@ -209,7 +216,11 @@ - #endif - - /* Number of bits in a file offset, on hosts where this is settable. */ --/* #undef _FILE_OFFSET_BITS */ -+#if __WORDSIZE == 32 -+#ifndef ZZIP__FILE_OFFSET_BITS -+#define ZZIP__FILE_OFFSET_BITS 64 -+#endif -+#endif - - /* Define for large files, on AIX-style hosts. */ - /* #undef _LARGE_FILES */ diff --git a/util/archive/zziplib/pspec.xml b/util/archive/zziplib/pspec.xml index 5080180db3..7d26acb336 100644 --- a/util/archive/zziplib/pspec.xml +++ b/util/archive/zziplib/pspec.xml @@ -3,7 +3,7 @@ zziplib - http://zziplib.sourceforge.net/ + https://github.com/gdraheim/zziplib PisiLinux Community admins@pisilinux.org @@ -18,22 +18,24 @@ 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.71.tar.gz + + https://github.com/gdraheim/zziplib/archive/v0.13.72.tar.gz cmake + xmlto + ninja zlib-devel aalib-devel docbook-xsl docbook-xml - libsdl-devel + python3-six python3-devel libxslt-devel libsdl2-devel - + @@ -45,8 +47,8 @@ /usr/bin /usr/lib - /usr/share/aclocal /usr/share/man/man3 + /usr/share/doc @@ -55,27 +57,24 @@ Development files for zziplib zziplib - libsdl-devel libsdl2-devel + zlib-devel /usr/include /usr/lib/pkgconfig - - - - - zziplib-docs - Documentation for zziplib - - zziplib - - - /usr/share/doc + /usr/share/aclocal + + 2021-01-21 + 0.13.72 + Ver. bump + fury + wascheme@tuta.io + 2020-06-23 0.13.71