Andreas Wacknitz
2022-12-20 ac9a360acdb8760df06d4e21cedfc36b8f32de12
Rebuilds 5

* rebuild libuv

* swipl: update to 9.0.3

* unrar: update to 6.2.3

* rebuild libexpat

* rebuild brotli
13 files modified
140 ■■■■■ changed files
components/archiver/unrar/Makefile 7 ●●●●● patch | view | raw | blame | history
components/library/brotli/Makefile 19 ●●●●● patch | view | raw | blame | history
components/library/brotli/brotli.p5m 3 ●●●●● patch | view | raw | blame | history
components/library/brotli/manifests/sample-manifest.p5m 28 ●●●● patch | view | raw | blame | history
components/library/brotli/pkg5 1 ●●●● patch | view | raw | blame | history
components/library/libexpat/Makefile 27 ●●●● patch | view | raw | blame | history
components/library/libexpat/manifests/sample-manifest.p5m 16 ●●●● patch | view | raw | blame | history
components/library/libexpat/test/results-all.master 16 ●●●●● patch | view | raw | blame | history
components/library/libuv/Makefile 5 ●●●●● patch | view | raw | blame | history
components/runtime/swi-prolog/Makefile 5 ●●●●● patch | view | raw | blame | history
components/runtime/swi-prolog/manifests/sample-manifest.p5m 4 ●●●● patch | view | raw | blame | history
components/runtime/swi-prolog/pkg5 4 ●●●● patch | view | raw | blame | history
components/runtime/swi-prolog/test/results-all.master 5 ●●●●● patch | view | raw | blame | history
components/archiver/unrar/Makefile
@@ -23,17 +23,16 @@
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2018, Michal Nowak
#
BUILD_STYLE=            justmake
BUILD_STYLE= justmake
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=            unrar
COMPONENT_VERSION=        6.2.2
COMPONENT_REVISION=        1
COMPONENT_VERSION=        6.2.3
COMPONENT_SRC=            $(COMPONENT_NAME)
COMPONENT_SUMMARY=        Rar archives extractor utility
COMPONENT_PROJECT_URL=    https://www.rarlabs.com/rar_add.htm
COMPONENT_ARCHIVE=        $(COMPONENT_NAME)src-$(COMPONENT_VERSION).tar.gz
COMPONENT_ARCHIVE_HASH= sha256:477d6ca7e246caec5412cc83b36c15a4ac837726a892df022919800129107cd5
COMPONENT_ARCHIVE_HASH= sha256:120936e41f826cd63d77a580aeea64c1b79fd3e2434f58ce8184e783b51e5b01
COMPONENT_ARCHIVE_URL=    https://www.rarlab.com/rar/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=    archiver/unrar
COMPONENT_CLASSIFICATION= Applications/System Utilities
components/library/brotli/Makefile
@@ -15,38 +15,31 @@
# Copyright 2020 Andreas Wacknitz
#
BUILD_BITS=            32_and_64
BUILD_STYLE=        cmake
BUILD_BITS= 64_and_32
BUILD_STYLE= cmake
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        brotli
COMPONENT_VERSION=    1.0.9
COMPONENT_REVISION=    1
COMPONENT_SUMMARY=    Library for generic-purpose lossless compression algorithm
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
    sha256:f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
COMPONENT_ARCHIVE_URL= \
    https://github.com/google/brotli/archive/v$(COMPONENT_VERSION).tar.gz
COMPONENT_PROJECT_URL=    https://github.com/google/brotli
COMPONENT_CLASSIFICATION=    System/Libraries
COMPONENT_ARCHIVE_URL=     $(COMPONENT_PROJECT_URL)/archive/v$(COMPONENT_VERSION).tar.gz
COMPONENT_ARCHIVE_HASH= sha256:f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
COMPONENT_FMRI=        library/brotli
COMPONENT_CLASSIFICATION=    System/Libraries
COMPONENT_LICENSE=    MIT
COMPONENT_LICENSE_FILE=    LICENSE
include $(WS_MAKE_RULES)/common.mk
CMAKE_BINDIR.64=    $(CMAKE_BINDIR.32)
CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE=Release
CMAKE_OPTIONS += -DCMAKE_VERBOSE_MAKEFILE=1
CMAKE_OPTIONS.64 += -DLIB_SUFFIX=/$(MACH64)
# Overwrite 32-bit binaries with 64-bit ones
$(BUILD_64):    $(BUILD_32)
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
# Strip times from test output, since they're always different
COMPONENT_TEST_TRANSFORMS += '-e "s%\([0-9\.]\)* sec%%"'
components/library/brotli/brotli.p5m
@@ -23,6 +23,9 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
<transform file path=.*/bin/$(MACH32)/.+ -> drop>
file path=usr/bin/$(MACH32)/brotli
file path=usr/bin/brotli
file path=usr/include/brotli/decode.h
file path=usr/include/brotli/encode.h
components/library/brotli/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2018 <contributor>
# Copyright 2022 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,6 +23,7 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/bin/$(MACH32)/brotli
file path=usr/bin/brotli
file path=usr/include/brotli/decode.h
file path=usr/include/brotli/encode.h
@@ -29,35 +31,35 @@
file path=usr/include/brotli/types.h
file path=usr/lib/$(MACH64)/libbrotlicommon-static.a
link path=usr/lib/$(MACH64)/libbrotlicommon.so target=libbrotlicommon.so.1
file path=usr/lib/$(MACH64)/libbrotlicommon.so.$(COMPONENT_VERSION)
file path=usr/lib/$(MACH64)/libbrotlicommon.so.$(HUMAN_VERSION)
link path=usr/lib/$(MACH64)/libbrotlicommon.so.1 \
    target=libbrotlicommon.so.$(COMPONENT_VERSION)
    target=libbrotlicommon.so.$(HUMAN_VERSION)
file path=usr/lib/$(MACH64)/libbrotlidec-static.a
link path=usr/lib/$(MACH64)/libbrotlidec.so target=libbrotlidec.so.1
file path=usr/lib/$(MACH64)/libbrotlidec.so.$(COMPONENT_VERSION)
file path=usr/lib/$(MACH64)/libbrotlidec.so.$(HUMAN_VERSION)
link path=usr/lib/$(MACH64)/libbrotlidec.so.1 \
    target=libbrotlidec.so.$(COMPONENT_VERSION)
    target=libbrotlidec.so.$(HUMAN_VERSION)
file path=usr/lib/$(MACH64)/libbrotlienc-static.a
link path=usr/lib/$(MACH64)/libbrotlienc.so target=libbrotlienc.so.1
file path=usr/lib/$(MACH64)/libbrotlienc.so.$(COMPONENT_VERSION)
file path=usr/lib/$(MACH64)/libbrotlienc.so.$(HUMAN_VERSION)
link path=usr/lib/$(MACH64)/libbrotlienc.so.1 \
    target=libbrotlienc.so.$(COMPONENT_VERSION)
    target=libbrotlienc.so.$(HUMAN_VERSION)
file path=usr/lib/$(MACH64)/pkgconfig/libbrotlicommon.pc
file path=usr/lib/$(MACH64)/pkgconfig/libbrotlidec.pc
file path=usr/lib/$(MACH64)/pkgconfig/libbrotlienc.pc
file path=usr/lib/libbrotlicommon-static.a
link path=usr/lib/libbrotlicommon.so target=libbrotlicommon.so.1
file path=usr/lib/libbrotlicommon.so.$(COMPONENT_VERSION)
file path=usr/lib/libbrotlicommon.so.$(HUMAN_VERSION)
link path=usr/lib/libbrotlicommon.so.1 \
    target=libbrotlicommon.so.$(COMPONENT_VERSION)
    target=libbrotlicommon.so.$(HUMAN_VERSION)
file path=usr/lib/libbrotlidec-static.a
link path=usr/lib/libbrotlidec.so target=libbrotlidec.so.1
file path=usr/lib/libbrotlidec.so.$(COMPONENT_VERSION)
link path=usr/lib/libbrotlidec.so.1 target=libbrotlidec.so.$(COMPONENT_VERSION)
file path=usr/lib/libbrotlidec.so.$(HUMAN_VERSION)
link path=usr/lib/libbrotlidec.so.1 target=libbrotlidec.so.$(HUMAN_VERSION)
file path=usr/lib/libbrotlienc-static.a
link path=usr/lib/libbrotlienc.so target=libbrotlienc.so.1
file path=usr/lib/libbrotlienc.so.$(COMPONENT_VERSION)
link path=usr/lib/libbrotlienc.so.1 target=libbrotlienc.so.$(COMPONENT_VERSION)
file path=usr/lib/libbrotlienc.so.$(HUMAN_VERSION)
link path=usr/lib/libbrotlienc.so.1 target=libbrotlienc.so.$(HUMAN_VERSION)
file path=usr/lib/pkgconfig/libbrotlicommon.pc
file path=usr/lib/pkgconfig/libbrotlidec.pc
file path=usr/lib/pkgconfig/libbrotlienc.pc
components/library/brotli/pkg5
@@ -1,6 +1,7 @@
{
    "dependencies": [
        "SUNWcs",
        "shell/ksh93",
        "system/library",
        "system/library/math"
    ],
components/library/libexpat/Makefile
@@ -25,22 +25,24 @@
# Copyright (c) 2019, Michal Nowak
#
BUILD_BITS=        64_and_32
BUILD_BITS= 64_and_32
USE_DEFAULT_TEST_TRANSFORMS= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        libexpat
COMPONENT_VERSION=    2.5.0
COMPONENT_VERSION_U=    $(shell echo $(COMPONENT_VERSION) | tr . _)
COMPONENT_FMRI=        library/expat
COMPONENT_VERSION_U=$(shell echo $(COMPONENT_VERSION) | tr . _)
COMPONENT_REVISION=    1
COMPONENT_SUMMARY=    libexpat - XML parser library
COMPONENT_DESCRIPTION=    A fast, non-validating, stream-oriented XML parsing library    
COMPONENT_CLASSIFICATION=    System/Libraries
COMPONENT_PROJECT_URL=    https://libexpat.github.io
COMPONENT_SRC_NAME=    expat
COMPONENT_SRC=        $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.lz
COMPONENT_ARCHIVE_HASH=    sha256:9a51edebc8c2910d8cc2b5e6b8d98350dea559922208f3e1a6bb5de33b6c2dc6
COMPONENT_ARCHIVE_URL=    https://github.com/libexpat/libexpat/releases/download/R_$(COMPONENT_VERSION_U)/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=        library/expat
COMPONENT_CLASSIFICATION=    System/Libraries
COMPONENT_LICENSE=    expat license
include $(WS_MAKE_RULES)/common.mk
@@ -48,21 +50,8 @@
CFLAGS += $(CPP_LARGEFILES)
# Deliver only 64-bit binary
CONFIGURE_OPTIONS.64+= --bindir=/usr/bin
CONFIGURE_OPTIONS+= --disable-static
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
COMPONENT_TEST_TRANSFORMS= \
    '-e "s/^\# //" ' \
    '-n ' \
    '-e "/TOTAL/p" ' \
    '-e "/PASS/p" '  \
    '-e "/SKIP/p" '  \
    '-e "/XFAIL/p" ' \
    '-e "/FAIL/p" '  \
    '-e "/XPASS/p" ' \
    '-e "/ERROR/p" ' \
CONFIGURE_OPTIONS.64 += --bindir=/usr/bin
CONFIGURE_OPTIONS += --disable-static
# Auto-generated dependencies
REQUIRED_PACKAGES += system/library
components/library/libexpat/manifests/sample-manifest.p5m
@@ -28,18 +28,18 @@
file path=usr/include/expat.h
file path=usr/include/expat_config.h
file path=usr/include/expat_external.h
file path=usr/lib/$(MACH64)/cmake/expat-$(COMPONENT_VERSION)/expat-config-version.cmake
file path=usr/lib/$(MACH64)/cmake/expat-$(COMPONENT_VERSION)/expat-config.cmake
file path=usr/lib/$(MACH64)/cmake/expat-$(COMPONENT_VERSION)/expat-noconfig.cmake
file path=usr/lib/$(MACH64)/cmake/expat-$(COMPONENT_VERSION)/expat.cmake
file path=usr/lib/$(MACH64)/cmake/expat-$(HUMAN_VERSION)/expat-config-version.cmake
file path=usr/lib/$(MACH64)/cmake/expat-$(HUMAN_VERSION)/expat-config.cmake
file path=usr/lib/$(MACH64)/cmake/expat-$(HUMAN_VERSION)/expat-noconfig.cmake
file path=usr/lib/$(MACH64)/cmake/expat-$(HUMAN_VERSION)/expat.cmake
link path=usr/lib/$(MACH64)/libexpat.so target=libexpat.so.1.8.10
link path=usr/lib/$(MACH64)/libexpat.so.1 target=libexpat.so.1.8.10
file path=usr/lib/$(MACH64)/libexpat.so.1.8.10
file path=usr/lib/$(MACH64)/pkgconfig/expat.pc
file path=usr/lib/cmake/expat-$(COMPONENT_VERSION)/expat-config-version.cmake
file path=usr/lib/cmake/expat-$(COMPONENT_VERSION)/expat-config.cmake
file path=usr/lib/cmake/expat-$(COMPONENT_VERSION)/expat-noconfig.cmake
file path=usr/lib/cmake/expat-$(COMPONENT_VERSION)/expat.cmake
file path=usr/lib/cmake/expat-$(HUMAN_VERSION)/expat-config-version.cmake
file path=usr/lib/cmake/expat-$(HUMAN_VERSION)/expat-config.cmake
file path=usr/lib/cmake/expat-$(HUMAN_VERSION)/expat-noconfig.cmake
file path=usr/lib/cmake/expat-$(HUMAN_VERSION)/expat.cmake
link path=usr/lib/libexpat.so target=libexpat.so.1.8.10
link path=usr/lib/libexpat.so.1 target=libexpat.so.1.8.10
file path=usr/lib/libexpat.so.1.8.10
components/library/libexpat/test/results-all.master
@@ -1,11 +1,9 @@
PASS: runtests
PASS: runtestspp
TOTAL: 2
PASS:  2
SKIP:  0
XFAIL: 0
XFAIL: 0
FAIL:  0
XPASS: 0
XPASS: 0
ERROR: 0
# TOTAL: 2
# PASS:  2
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
components/library/libuv/Makefile
@@ -17,14 +17,15 @@
COMPONENT_NAME=        libuv
COMPONENT_VERSION=    1.44.2
COMPONENT_REVISION=    1
COMPONENT_SUMMARY=    Cross-platform asynchronous I/O library
COMPONENT_PROJECT_URL=    https://libuv.org/
COMPONENT_FMRI=        library/libuv
COMPONENT_CLASSIFICATION=System/Libraries
COMPONENT_SRC=        $(COMPONENT_NAME)-v$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_URL=    https://dist.libuv.org/dist/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_ARCHIVE_HASH=    sha256:ccfcdc968c55673c6526d8270a9c8655a806ea92468afcbcabc2b16040f03cb4
COMPONENT_FMRI=        library/libuv
COMPONENT_CLASSIFICATION=System/Libraries
COMPONENT_LICENSE=    MIT
COMPONENT_LICENSE_FILE=    LICENSE
components/runtime/swi-prolog/Makefile
@@ -12,19 +12,18 @@
# Copyright 2022 Andreas Wacknitz
#
BUILD_BITS= 64
BUILD_STYLE= cmake
USE_OPENSSL11= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        swipl
COMPONENT_VERSION=    9.0.2
COMPONENT_VERSION=    9.0.3
COMPONENT_SUMMARY=    Robust, mature, free. Prolog for the real world.
COMPONENT_PROJECT_URL= https://www.swi-prolog.org
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_URL=    $(COMPONENT_PROJECT_URL)/download/stable/src/$(COMPONENT_ARCHIVE)
COMPONENT_ARCHIVE_HASH=    sha256:33b5de34712d58f14c1e019bd1613df9a474f5e5fd024155a0f6e67ebb01c307
COMPONENT_ARCHIVE_HASH=    sha256:e2919bc58710abd62b9cd40179a724c30bdbe9aa428af49d7fdc6d0158921afb
COMPONENT_FMRI=        runtime/$(COMPONENT_NAME)
COMPONENT_CLASSIFICATION=    Development/System
COMPONENT_LICENSE=    BSD-2 license, others
components/runtime/swi-prolog/manifests/sample-manifest.p5m
@@ -538,9 +538,9 @@
file path=usr/lib/swipl/lib/i386-sunos/libedit4pl.so
file path=usr/lib/swipl/lib/i386-sunos/libjpl.so
link path=usr/lib/swipl/lib/i386-sunos/libswipl.so target=libswipl.so.9
file path=usr/lib/swipl/lib/i386-sunos/libswipl.so.$(COMPONENT_VERSION)
file path=usr/lib/swipl/lib/i386-sunos/libswipl.so.$(HUMAN_VERSION)
link path=usr/lib/swipl/lib/i386-sunos/libswipl.so.9 \
    target=libswipl.so.$(COMPONENT_VERSION)
    target=libswipl.so.$(HUMAN_VERSION)
file path=usr/lib/swipl/lib/i386-sunos/md54pl.so
file path=usr/lib/swipl/lib/i386-sunos/memfile.so
file path=usr/lib/swipl/lib/i386-sunos/ntriples.so
components/runtime/swi-prolog/pkg5
@@ -18,8 +18,8 @@
        "shell/ksh93",
        "system/library",
        "system/library/fontconfig",
        "system/library/g++-7-runtime",
        "system/library/gcc-7-runtime",
        "system/library/g++-10-runtime",
        "system/library/gcc-10-runtime",
        "system/library/math",
        "x11/library/libx11",
        "x11/library/libxft",
components/runtime/swi-prolog/test/results-all.master
@@ -56,7 +56,7 @@
      Start 28: swipl:thread_wait
28/79 Test #28: swipl:thread_wait ................   Passed SEC sec
      Start 29: swipl:rational
29/79 Test #29: swipl:rational ...................***Failed SEC sec
29/79 Test #29: swipl:rational ...................   Passed SEC sec
      Start 30: chr:chr
30/79 Test #30: chr:chr ..........................   Passed SEC sec
      Start 31: clib:crypt
@@ -158,12 +158,11 @@
      Start 79: xpce:xpce
79/79 Test #79: xpce:xpce ........................   Passed SEC sec
97% tests passed, 2 tests failed out of 79
99% tests passed, 1 tests failed out of 79
Total Test time (real) = SEC sec
The following tests FAILED:
     29 - swipl:rational (Failed)
     76 - pcre:pcre (Failed)
Errors while running CTest
Output from these tests are in: $(@D)/Testing/Temporary/LastTest.log