Andreas Wacknitz
2022-12-26 1fd6605a193d5d243d22aa263cb4d80f950102dc
Rebuild 21

* rebuild gtk-vnc and update its dependencies

* rebuild libgpg-error

* rebuild libgcrypt

* rebuild zenlib

* rebuild libtool
12 files modified
145 ■■■■ changed files
components/developer/libtool/Makefile 37 ●●●● patch | view | raw | blame | history
components/developer/libtool/test/results-all.master 4 ●●●● patch | view | raw | blame | history
components/library/ZenLib/Makefile 17 ●●●● patch | view | raw | blame | history
components/library/ZenLib/ZenLib.p5m 1 ●●●● patch | view | raw | blame | history
components/library/ZenLib/manifests/sample-manifest.p5m 1 ●●●● patch | view | raw | blame | history
components/library/ZenLib/pkg5 4 ●●●● patch | view | raw | blame | history
components/library/gtk-vnc/Makefile 48 ●●●● patch | view | raw | blame | history
components/library/gtk-vnc/gtk-vnc.p5m 6 ●●●● patch | view | raw | blame | history
components/library/gtk-vnc/manifests/sample-manifest.p5m 6 ●●●● patch | view | raw | blame | history
components/library/gtk-vnc/pkg5 4 ●●● patch | view | raw | blame | history
components/library/libgcrypt/Makefile 3 ●●●● patch | view | raw | blame | history
components/library/libgpg-error/Makefile 14 ●●●●● patch | view | raw | blame | history
components/developer/libtool/Makefile
@@ -25,46 +25,45 @@
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#
BUILD_STYLE=configure
BUILD_BITS=32_and_64
BUILD_BITS= 32_and_64
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=         libtool
COMPONENT_VERSION=      2.4.7
COMPONENT_FMRI=         developer/build/libtool
COMPONENT_REVISION=        1
COMPONENT_SUMMARY=      GNU libtool
COMPONENT_CLASSIFICATION=Development/GNU
COMPONENT_PROJECT_URL=  https://www.gnu.org/software/libtool/
COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= sha256:4f7f217f057ce655ff22559ad221a0fd8ef84ad1fc5fcb6990cecc333aa1635d
COMPONENT_ARCHIVE_URL=  https://ftp.gnu.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=         developer/build/libtool
COMPONENT_CLASSIFICATION=Development/GNU
COMPONENT_LICENSE=      GPLv2, FDLv1.3
# For now, we want to continue to provide the libltdl.so's (and their
# links) from libtool 1.5.22.
#
COMPONENT_VERSION_1 =    1.5.22
COMPONENT_SRC_1 =    $(COMPONENT_NAME)-$(COMPONENT_VERSION_1)
COMPONENT_ARCHIVE_1 =    $(COMPONENT_SRC_1).tar.gz
COMPONENT_ARCHIVE_HASH_1 = \
    sha256:88e9ffaaade21c1ddaf6297723dd2fb4ca18ccaef0499a28b6e672f02c8ceb5d
COMPONENT_ARCHIVE_URL_1 = https://ftp.gnu.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE_1)
SOURCE_DIR_1 =        $(COMPONENT_DIR)/$(COMPONENT_SRC_1)
COMPONENT_VERSION_1= 1.5.22
COMPONENT_SRC_1= $(COMPONENT_NAME)-$(COMPONENT_VERSION_1)
COMPONENT_ARCHIVE_1= $(COMPONENT_SRC_1).tar.gz
COMPONENT_ARCHIVE_HASH_1= sha256:88e9ffaaade21c1ddaf6297723dd2fb4ca18ccaef0499a28b6e672f02c8ceb5d
COMPONENT_ARCHIVE_URL_1= https://ftp.gnu.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE_1)
SOURCE_DIR_1= $(COMPONENT_DIR)/$(COMPONENT_SRC_1)
include $(WS_MAKE_RULES)/common.mk
PATH=$(PATH.gnu)
PATH= $(PATH.gnu)
CONFIGURE_OPTIONS  +=        --infodir=$(CONFIGURE_INFODIR)
CONFIGURE_OPTIONS  +=        --disable-static
CONFIGURE_OPTIONS  +=        PERL="$(PERL)"
CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
CONFIGURE_OPTIONS += --disable-static
CONFIGURE_OPTIONS += PERL="$(PERL)"
COMPONENT_PREP_ACTION = (cd $(@D) ; $(TOUCH) $(SOURCE_DIR)/README-release ; ./bootstrap --force --no-git)
COMPONENT_PREP_ACTION= ( cd $(@D) ; $(TOUCH) $(SOURCE_DIR)/README-release ; ./bootstrap --force --no-git )
# Remove the hard-wired compiler locations in the LTCC and two CC lines
# in the two versions of the libtool script.
COMPONENT_POST_INSTALL_ACTION = \
COMPONENT_POST_INSTALL_ACTION= \
    (for dir in $(PROTOUSRBINDIR) $(PROTOUSRBINDIR)/$(MACH64) ; do \
        cd $$dir; \
        /usr/gnu/bin/sed -i \
@@ -83,8 +82,8 @@
    '-e "/FAILED/p" '
# Macros to configure, build, and install the old version for the time being.
BUILD_OLD_DIR_32 = $(COMPONENT_DIR)/build/$(COMPONENT_VERSION_1)-$(MACH32)
BUILD_OLD_DIR_64 = $(COMPONENT_DIR)/build/$(COMPONENT_VERSION_1)-$(MACH64)
BUILD_OLD_DIR_32= $(COMPONENT_DIR)/build/$(COMPONENT_VERSION_1)-$(MACH32)
BUILD_OLD_DIR_64= $(COMPONENT_DIR)/build/$(COMPONENT_VERSION_1)-$(MACH64)
$(BUILD_OLD_DIR_32)/.configured: CONFIGURE_SCRIPT = $(SOURCE_DIR_1)/configure
$(BUILD_OLD_DIR_64)/.configured: CONFIGURE_SCRIPT = $(SOURCE_DIR_1)/configure
components/developer/libtool/test/results-all.master
@@ -66,7 +66,7 @@
 63: passing FC flags through libtool                ok
 64: passing GCJ flags through libtool               skipped (flags.at:24)
 65: inherited_linker_flags                          ok
 66: Link order test                                 ok
 66: Link order test                                 FAILED (link-order.at:106)
 67: Link order of deplibs                           ok
 68: Failure tests                                   ok
 69: shlibpath_overrides_runpath                     ok
@@ -173,7 +173,7 @@
## ------------- ##
## Test results. ##
## ------------- ##
8 failed (5 expected failures).
9 failed (5 expected failures).
19 tests were skipped.
## -------------------------- ##
## testsuite.log was created. ##
components/library/ZenLib/Makefile
@@ -12,31 +12,32 @@
# Copyright 2022, Daniel Chan
#
BUILD_BITS=64
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        ZenLib
COMPONENT_VERSION=    0.4.39
COMPONENT_REVISION=    1
COMPONENT_SUMMARY=    Small C++ derivate classes to have an easier life
COMPONENT_PROJECT_URL=    https://github.com/MediaArea/ZenLib
COMPONENT_FMRI=        library/libzen
COMPONENT_CLASSIFICATION=System/Libraries
COMPONENT_PROJECT_URL=    https://github.com/MediaArea/$(COMPONENT_NAME)
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_URL=    https://github.com/MediaArea/$(COMPONENT_NAME)/archive/refs/tags/v$(COMPONENT_VERSION).tar.gz
COMPONENT_ARCHIVE_URL=    $(COMPOENT_PROJECT_URL)/archive/refs/tags/v$(COMPONENT_VERSION).tar.gz
COMPONENT_ARCHIVE_HASH=    sha256:a29fcafe41afac4ff818414ada18e4549bb2e77b2962bba2dd39db5cf747044e
COMPONENT_FMRI=        library/libzen
COMPONENT_CLASSIFICATION=System/Libraries
COMPONENT_LICENSE=    GPLv3
COMPONENT_LICENSE_FILE= License.txt
TEST_TARGET=    $(NO_TESTS)
TEST_TARGET= $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
CONFIGURE_SCRIPT =    $(SOURCE_DIR)/Project/GNU/Library/configure
CONFIGURE_SCRIPT= $(SOURCE_DIR)/Project/GNU/Library/configure
COMPONENT_PRE_CONFIGURE_ACTION=    ( cd $(SOURCE_DIR)/Project/GNU/Library/ && ./autogen.sh && cd $(SOURCE_DIR); )
CONFIGURE_OPTIONS+=    --enable-shared
CONFIGURE_OPTIONS+=    --disable-static
COMPONENT_POST_UNPACK_ACTION= \
            mv ZenLib-0.4.39/Source/ZenLib/Thread.cpp ZenLib-0.4.39/Source/ZenLib/Thread.cpp.old; \
            dos2unix ZenLib-0.4.39/Source/ZenLib/Thread.cpp.old &> ZenLib-0.4.39/Source/ZenLib/Thread.cpp
components/library/ZenLib/ZenLib.p5m
@@ -14,6 +14,7 @@
#
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)
components/library/ZenLib/manifests/sample-manifest.p5m
@@ -14,6 +14,7 @@
#
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)
components/library/ZenLib/pkg5
@@ -3,8 +3,8 @@
        "SUNWcs",
        "shell/ksh93",
        "system/library",
        "system/library/g++-7-runtime",
        "system/library/gcc-7-runtime",
        "system/library/g++-10-runtime",
        "system/library/gcc-10-runtime",
        "system/library/math"
    ],
    "fmris": [
components/library/gtk-vnc/Makefile
@@ -13,22 +13,20 @@
# Copyright 2016 Alexander Pyhalov
#
BUILD_BITS=        32_and_64
BUILD_BITS= 32_and_64
USE_DEFAULT_TEST_TRANSFORMS= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        gtk-vnc
COMPONENT_MJR_VERSION=    0.7
COMPONENT_MNR_VERSION=    2
COMPONENT_VERSION=    $(COMPONENT_MJR_VERSION).$(COMPONENT_MNR_VERSION)
COMPONENT_REVISION=    1
COMPONENT_REVISION=    2
COMPONENT_SUMMARY=    gtk-vnc - A GTK widget for VNC client
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= \
    sha256:f893f32b1ef6d09dd23cda39b8a2567be7c2aebda58026288e1362f042e20808
COMPONENT_ARCHIVE_URL= \
    https://download.gnome.org/sources/$(COMPONENT_NAME)/$(COMPONENT_MJR_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_ARCHIVE_HASH= sha256:f893f32b1ef6d09dd23cda39b8a2567be7c2aebda58026288e1362f042e20808
COMPONENT_ARCHIVE_URL=    https://download.gnome.org/sources/$(COMPONENT_NAME)/$(COMPONENT_MJR_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL=    https://wiki.gnome.org/Projects/gtk-vnc
COMPONENT_FMRI=        library/desktop/gtk-vnc
COMPONENT_CLASSIFICATION= Development/GNOME and GTK+
@@ -37,37 +35,41 @@
include $(WS_MAKE_RULES)/common.mk
COMPONENT_PREP_ACTION += (cd $(@D) && autoreconf -fi)
COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
COMPONENT_PREP_ACTION += ( cd $(@D) && autoreconf -fi )
CONFIGURE_OPTIONS+= --sysconfdir=/etc
CONFIGURE_OPTIONS+= --localstatedir=/var/lib
CONFIGURE_OPTIONS+= --with-gtk=3.0
CONFIGURE_ENV    += XGETTEXT=/usr/gnu/bin/xgettext
CONFIGURE_ENV    += MSGFMT=/usr/gnu/bin/msgfmt
CONFIGURE_ENV    += PERL=$(PERL)
CONFIGURE_ENV    += PYTHON="$(PYTHON)"
CONFIGURE_ENV    += am_cv_python_pythondir="$(PYTHON_VENDOR_PACKAGES)"
CONFIGURE_ENV    += am_cv_python_pyexecdir="$(PYTHON_VENDOR_PACKAGES)"
COMPONENT_PRE_CONFIGURE_ACTION= ( $(CLONEY) $(SOURCE_DIR) $(@D) )
CONFIGURE_ENV    += CPPFLAGS="$(CPPFLAGS)"
CONFIGURE_OPTIONS += --sysconfdir=/etc
CONFIGURE_OPTIONS += --localstatedir=/var/lib
CONFIGURE_OPTIONS += --with-gtk=3.0
# Our vala seems to be too new
CONFIGURE_OPTIONS += --enable-vala
CONFIGURE_ENV += XGETTEXT=/usr/gnu/bin/xgettext
CONFIGURE_ENV += MSGFMT=/usr/gnu/bin/msgfmt
CONFIGURE_ENV += PERL=$(PERL)
CONFIGURE_ENV += PYTHON="$(PYTHON)"
# Our default python seems to be too new, even the following settings don't let it be found:
CONFIGURE_ENV += am_cv_python_pythondir="$(PYTHON_VENDOR_PACKAGES)"
CONFIGURE_ENV += am_cv_python_pyexecdir="$(PYTHON_VENDOR_PACKAGES)"
CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)"
COMPONENT_BUILD_ENV += CC="$(CC)"
COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)"
COMPONENT_BUILD_ENV += LDFLAGS="$(LDFLAGS)"
COMPONENT_INSTALL_ENV+= GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
COMPONENT_INSTALL_ENV += GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
REQUIRED_PACKAGES += developer/vala
unexport SHELLOPTS
# Auto-generated dependencies
REQUIRED_PACKAGES += library/audio/pulseaudio
REQUIRED_PACKAGES += library/desktop/cairo
REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
REQUIRED_PACKAGES += library/desktop/gtk-vnc
REQUIRED_PACKAGES += library/desktop/gtk3
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += library/gnutls-3
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += runtime/python-27
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/security/libgcrypt
REQUIRED_PACKAGES += system/library/security/libsasl
components/library/gtk-vnc/gtk-vnc.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2017 Alexander Pyhalov
# Copyright 2022 Andreas Wacknitz
#
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)
@@ -60,6 +61,9 @@
file path=usr/lib/$(MACH64)/pkgconfig/gtk-vnc-2.0.pc
file path=usr/lib/$(MACH64)/pkgconfig/gvnc-1.0.pc
file path=usr/lib/$(MACH64)/pkgconfig/gvncpulse-1.0.pc
file path=usr/lib/girepository-1.0/GVnc-1.0.typelib
file path=usr/lib/girepository-1.0/GVncPulse-1.0.typelib
file path=usr/lib/girepository-1.0/GtkVnc-2.0.typelib
link path=usr/lib/libgtk-vnc-2.0.so target=libgtk-vnc-2.0.so.0.0.2
link path=usr/lib/libgtk-vnc-2.0.so.0 target=libgtk-vnc-2.0.so.0.0.2
file path=usr/lib/libgtk-vnc-2.0.so.0.0.2
components/library/gtk-vnc/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2020 <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)
@@ -60,6 +61,9 @@
file path=usr/lib/$(MACH64)/pkgconfig/gtk-vnc-2.0.pc
file path=usr/lib/$(MACH64)/pkgconfig/gvnc-1.0.pc
file path=usr/lib/$(MACH64)/pkgconfig/gvncpulse-1.0.pc
file path=usr/lib/girepository-1.0/GVnc-1.0.typelib
file path=usr/lib/girepository-1.0/GVncPulse-1.0.typelib
file path=usr/lib/girepository-1.0/GtkVnc-2.0.typelib
link path=usr/lib/libgtk-vnc-2.0.so target=libgtk-vnc-2.0.so.0.0.2
link path=usr/lib/libgtk-vnc-2.0.so.0 target=libgtk-vnc-2.0.so.0.0.2
file path=usr/lib/libgtk-vnc-2.0.so.0.0.2
components/library/gtk-vnc/pkg5
@@ -1,16 +1,14 @@
{
    "dependencies": [
        "SUNWcs",
        "developer/vala",
        "library/audio/pulseaudio",
        "library/desktop/cairo",
        "library/desktop/gdk-pixbuf",
        "library/desktop/gtk-vnc",
        "library/desktop/gtk3",
        "library/glib2",
        "library/gnutls-3",
        "library/zlib",
        "runtime/python-27",
        "shell/ksh93",
        "system/library",
        "system/library/security/libgcrypt",
        "system/library/security/libsasl",
components/library/libgcrypt/Makefile
@@ -22,12 +22,13 @@
# Copyright 2011 Audioboo Ltd. All rights reserved.
#
BUILD_BITS=        32_and_64
BUILD_BITS= 32_and_64
USE_DEFAULT_TEST_TRANSFORMS= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=        libgcrypt
COMPONENT_VERSION=    1.10.1
COMPONENT_REVISION=    1
COMPONENT_SUMMARY=    GnuPG libgcrypt library
COMPONENT_PROJECT_URL=    https://www.gnu.org/software/libgcrypt/
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
components/library/libgpg-error/Makefile
@@ -22,12 +22,14 @@
# Copyright 2011 Audioboo Ltd. All rights reserved.
# Copyright 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=        libgpg-error
COMPONENT_VERSION=    1.46
COMPONENT_REVISION=    1
COMPONENT_SUMMARY=    GnuPG Error Library
COMPONENT_PROJECT_URL=    https://www.gnupg.org/related_software/libgpg-error/
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -42,13 +44,13 @@
COMPONENT_PREP_ACTION = (cd $(@D) && autoreconf -fi)
CONFIGURE_OPTIONS  +=    --disable-static
CONFIGURE_OPTIONS  +=    --enable-shared
CONFIGURE_OPTIONS  +=    --enable-threads=posix
CONFIGURE_OPTIONS  +=    --enable-install-gpg-error-config
CONFIGURE_OPTIONS += --disable-static
CONFIGURE_OPTIONS += --enable-shared
CONFIGURE_OPTIONS += --enable-threads=posix
CONFIGURE_OPTIONS += --enable-install-gpg-error-config
# Auto-generated dependencies
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/xopen/xcu4