Andreas Wacknitz
2023-12-25 0ad0b263ee03e19ef416a44bb7f47a220b43fe27
avahi: (partially) revert dropping 32 bit

4 files modified
108 ■■■■ changed files
components/network/avahi/Makefile 15 ●●●●● patch | view | raw | blame | history
components/network/avahi/avahi-gui.p5m 6 ●●●● patch | view | raw | blame | history
components/network/avahi/avahi.p5m 42 ●●●●● patch | view | raw | blame | history
components/network/avahi/manifests/sample-manifest.p5m 45 ●●●● patch | view | raw | blame | history
components/network/avahi/Makefile
@@ -14,21 +14,21 @@
# Copyright 2023 Andreas Wacknitz
#
BUILD_BITS= 64
BUILD_BITS= 32_and_64
USE_DEFAULT_TEST_TRANSFORMS= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= avahi
COMPONENT_VERSION= 0.7
COMPONENT_REVISION= 6
COMPONENT_REVISION= 7
COMPONENT_SUMMARY= Avahi client and bridge to pkg://service/network/dns/mdns
COMPONENT_PROJECT_URL=    https://avahi.org
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    sha256:57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
COMPONENT_ARCHIVE_URL=    https://github.com/lathiat/avahi/releases/download/v0.7/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL=    https://avahi.org
COMPONENT_ARCHIVE_HASH= sha256:57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
COMPONENT_FMRI=            system/network/avahi
COMPONENT_CLASSIFICATION = Applications/Internet
COMPONENT_CLASSIFICATION= Applications/Internet
COMPONENT_LICENSE=        LGPLv2.1
COMPONENT_LICENSE_FILE=    LICENSE
@@ -41,7 +41,7 @@
    autoconf )
# Need this to build service-type-database
COMPONENT_PRE_CONFIGURE_ACTION= ( cp -r $(SOURCE_DIR)/* $(@D) )
COMPONENT_PRE_CONFIGURE_ACTION= ( $(CP) -r $(SOURCE_DIR)/* $(@D) )
LDFLAGS += -ldns_sd
@@ -62,6 +62,9 @@
CONFIGURE_OPTIONS += --disable-autoipd
CONFIGURE_OPTIONS += --disable-gdbm
CONFIGURE_OPTIONS += --enable-dbm
# We don't want 32 bit gui
CONFIGURE_OPTIONS.32 += --disable-gtk
CONFIGURE_OPTIONS.32 += --disable-gtk3
CONFIGURE_OPTIONS.32 += --disable-pygobject
CONFIGURE_ENV += XGETTEXT=/usr/gnu/bin/xgettext
components/network/avahi/avahi-gui.p5m
@@ -22,10 +22,10 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/bin/avahi-discover
file path=usr/bin/avahi-discover-standalone
file usr/bin/$(MACH64)/avahi-discover path=usr/bin/avahi-discover
file usr/bin/$(MACH64)/avahi-discover-standalone path=usr/bin/avahi-discover-standalone
link path=usr/bin/bshell target=bssh
file path=usr/bin/bssh
file usr/bin/$(MACH64)/bssh path=usr/bin/bssh
link path=usr/bin/bvnc target=bssh
file path=usr/include/avahi-ui/avahi-ui.h
link path=usr/lib/$(MACH64)/libavahi-ui.so target=libavahi-ui.so.0.1.4
components/network/avahi/avahi.p5m
@@ -43,7 +43,22 @@
file path=etc/avahi/services/sftp-ssh.service
file path=etc/avahi/services/ssh.service
file path=etc/dbus-1/system.d/avahi-dbus.conf
file path=usr/bin/avahi-bookmarks pkg.depend.bypass-generate=.*
file path=usr/bin/$(MACH64)/avahi-bookmarks pkg.depend.bypass-generate=.*
file path=usr/bin/$(MACH64)/avahi-browse
link path=usr/bin/$(MACH64)/avahi-browse-domains target=avahi-browse
#file path=usr/bin/$(MACH64)/avahi-discover
#file path=usr/bin/$(MACH64)/avahi-discover-standalone
file path=usr/bin/$(MACH64)/avahi-publish
link path=usr/bin/$(MACH64)/avahi-publish-address target=avahi-publish
link path=usr/bin/$(MACH64)/avahi-publish-service target=avahi-publish
file path=usr/bin/$(MACH64)/avahi-resolve
link path=usr/bin/$(MACH64)/avahi-resolve-address target=avahi-resolve
link path=usr/bin/$(MACH64)/avahi-resolve-host-name target=avahi-resolve
file path=usr/bin/$(MACH64)/avahi-set-host-name
#link path=usr/bin/$(MACH64)/bshell target=bssh
#file path=usr/bin/$(MACH64)/bssh
#link path=usr/bin/$(MACH64)/bvnc target=bssh
#file path=usr/bin/avahi-bookmarks pkg.depend.bypass-generate=.*
file path=usr/bin/avahi-browse
link path=usr/bin/avahi-browse-domains target=avahi-browse
#file path=usr/bin/avahi-discover
@@ -119,8 +134,33 @@
file path=usr/lib/$(MACH64)/pkgconfig/avahi-glib.pc
file path=usr/lib/$(MACH64)/pkgconfig/avahi-gobject.pc
#file path=usr/lib/$(MACH64)/pkgconfig/avahi-ui.pc
file path=usr/lib/avahi/service-types.db.dir
file path=usr/lib/avahi/service-types.db.pag
file path=usr/lib/girepository-1.0/Avahi-0.6.typelib
file path=usr/lib/girepository-1.0/AvahiCore-0.6.typelib
link path=usr/lib/libavahi-client.so target=libavahi-client.so.3.2.9
link path=usr/lib/libavahi-client.so.3 target=libavahi-client.so.3.2.9
file path=usr/lib/libavahi-client.so.3.2.9
link path=usr/lib/libavahi-common.so target=libavahi-common.so.3.5.3
link path=usr/lib/libavahi-common.so.3 target=libavahi-common.so.3.5.3
file path=usr/lib/libavahi-common.so.3.5.3
link path=usr/lib/libavahi-core.so target=libavahi-core.so.7.0.2
link path=usr/lib/libavahi-core.so.7 target=libavahi-core.so.7.0.2
file path=usr/lib/libavahi-core.so.7.0.2
link path=usr/lib/libavahi-glib.so target=libavahi-glib.so.1.0.2
link path=usr/lib/libavahi-glib.so.1 target=libavahi-glib.so.1.0.2
file path=usr/lib/libavahi-glib.so.1.0.2
link path=usr/lib/libavahi-gobject.so target=libavahi-gobject.so.0.0.5
link path=usr/lib/libavahi-gobject.so.0 target=libavahi-gobject.so.0.0.5
file path=usr/lib/libavahi-gobject.so.0.0.5
file path=usr/lib/pkgconfig/avahi-client.pc
file path=usr/lib/pkgconfig/avahi-core.pc
file path=usr/lib/pkgconfig/avahi-glib.pc
file path=usr/lib/pkgconfig/avahi-gobject.pc
file path=usr/lib/python$(PYVER)/vendor-packages/avahi/ServiceTypeDatabase.py pkg.depend.bypass-generate=.*
file path=usr/lib/python$(PYVER)/vendor-packages/avahi/__init__.py
file path=usr/sbin/$(MACH64)/avahi-daemon
file path=usr/sbin/$(MACH64)/avahi-dnsconfd
file path=usr/sbin/avahi-daemon
file path=usr/sbin/avahi-dnsconfd
#file path=usr/share/applications/avahi-discover.desktop
components/network/avahi/manifests/sample-manifest.p5m
@@ -29,11 +29,24 @@
file path=etc/avahi/services/sftp-ssh.service
file path=etc/avahi/services/ssh.service
file path=etc/dbus-1/system.d/avahi-dbus.conf
file path=usr/bin/$(MACH64)/avahi-bookmarks
file path=usr/bin/$(MACH64)/avahi-browse
link path=usr/bin/$(MACH64)/avahi-browse-domains target=avahi-browse
file path=usr/bin/$(MACH64)/avahi-discover
file path=usr/bin/$(MACH64)/avahi-discover-standalone
file path=usr/bin/$(MACH64)/avahi-publish
link path=usr/bin/$(MACH64)/avahi-publish-address target=avahi-publish
link path=usr/bin/$(MACH64)/avahi-publish-service target=avahi-publish
file path=usr/bin/$(MACH64)/avahi-resolve
link path=usr/bin/$(MACH64)/avahi-resolve-address target=avahi-resolve
link path=usr/bin/$(MACH64)/avahi-resolve-host-name target=avahi-resolve
file path=usr/bin/$(MACH64)/avahi-set-host-name
link path=usr/bin/$(MACH64)/bshell target=bssh
file path=usr/bin/$(MACH64)/bssh
link path=usr/bin/$(MACH64)/bvnc target=bssh
file path=usr/bin/avahi-bookmarks
file path=usr/bin/avahi-browse
link path=usr/bin/avahi-browse-domains target=avahi-browse
file path=usr/bin/avahi-discover
file path=usr/bin/avahi-discover-standalone
file path=usr/bin/avahi-publish
link path=usr/bin/avahi-publish-address target=avahi-publish
link path=usr/bin/avahi-publish-service target=avahi-publish
@@ -41,9 +54,6 @@
link path=usr/bin/avahi-resolve-address target=avahi-resolve
link path=usr/bin/avahi-resolve-host-name target=avahi-resolve
file path=usr/bin/avahi-set-host-name
link path=usr/bin/bshell target=bssh
file path=usr/bin/bssh
link path=usr/bin/bvnc target=bssh
file path=usr/include/avahi-client/client.h
file path=usr/include/avahi-client/lookup.h
file path=usr/include/avahi-client/publish.h
@@ -105,8 +115,33 @@
file path=usr/lib/$(MACH64)/pkgconfig/avahi-glib.pc
file path=usr/lib/$(MACH64)/pkgconfig/avahi-gobject.pc
file path=usr/lib/$(MACH64)/pkgconfig/avahi-ui.pc
file path=usr/lib/avahi/service-types.db.dir
file path=usr/lib/avahi/service-types.db.pag
file path=usr/lib/girepository-1.0/Avahi-0.6.typelib
file path=usr/lib/girepository-1.0/AvahiCore-0.6.typelib
link path=usr/lib/libavahi-client.so target=libavahi-client.so.3.2.9
link path=usr/lib/libavahi-client.so.3 target=libavahi-client.so.3.2.9
file path=usr/lib/libavahi-client.so.3.2.9
link path=usr/lib/libavahi-common.so target=libavahi-common.so.3.5.3
link path=usr/lib/libavahi-common.so.3 target=libavahi-common.so.3.5.3
file path=usr/lib/libavahi-common.so.3.5.3
link path=usr/lib/libavahi-core.so target=libavahi-core.so.7.0.2
link path=usr/lib/libavahi-core.so.7 target=libavahi-core.so.7.0.2
file path=usr/lib/libavahi-core.so.7.0.2
link path=usr/lib/libavahi-glib.so target=libavahi-glib.so.1.0.2
link path=usr/lib/libavahi-glib.so.1 target=libavahi-glib.so.1.0.2
file path=usr/lib/libavahi-glib.so.1.0.2
link path=usr/lib/libavahi-gobject.so target=libavahi-gobject.so.0.0.5
link path=usr/lib/libavahi-gobject.so.0 target=libavahi-gobject.so.0.0.5
file path=usr/lib/libavahi-gobject.so.0.0.5
file path=usr/lib/pkgconfig/avahi-client.pc
file path=usr/lib/pkgconfig/avahi-core.pc
file path=usr/lib/pkgconfig/avahi-glib.pc
file path=usr/lib/pkgconfig/avahi-gobject.pc
file path=usr/lib/python$(PYVER)/vendor-packages/avahi/ServiceTypeDatabase.py
file path=usr/lib/python$(PYVER)/vendor-packages/avahi/__init__.py
file path=usr/sbin/$(MACH64)/avahi-daemon
file path=usr/sbin/$(MACH64)/avahi-dnsconfd
file path=usr/sbin/avahi-daemon
file path=usr/sbin/avahi-dnsconfd
file path=usr/share/applications/avahi-discover.desktop