* [PR PATCH] Update avahi, take ownership
@ 2020-05-07 20:53 ahesford
2020-05-09 16:35 ` [PR PATCH] [Updated] " ahesford
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: ahesford @ 2020-05-07 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 783 bytes --]
There is a new pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages avahi
https://github.com/void-linux/void-packages/pull/21731
Update avahi, take ownership
This brings avahi and its subpackages up to date. Included are new libraries to incorporate avahi with libevent or qt5, as new subpackages. Also, the Python parts of avahi are compatible with py3, so there are new `-python3` subpackages as appropriate. The `avahi-python` package is still usable with py2 and has been preserved; `avahi-python-utils` is now an empty meta to bring in the new `avahi-python3-utils`, as the contents of the newer package supplant the older.
A patch file from https://github.com/void-linux/void-packages/pull/21731.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-avahi-21731.patch --]
[-- Type: text/x-diff, Size: 13049 bytes --]
From 85b4be426e8fcbc5d07b3ec224bbcfeff52107bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 7 May 2020 14:47:34 -0400
Subject: [PATCH 1/2] avahi: update to 0.8.
---
common/shlibs | 1 +
srcpkgs/avahi-libevent-libs | 1 +
srcpkgs/avahi-libevent-libs-devel | 1 +
srcpkgs/avahi/template | 54 ++++++++++++++++++++++---------
4 files changed, 42 insertions(+), 15 deletions(-)
create mode 120000 srcpkgs/avahi-libevent-libs
create mode 120000 srcpkgs/avahi-libevent-libs-devel
diff --git a/common/shlibs b/common/shlibs
index 4bdc03e8b23..57b9428e969 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -389,6 +389,7 @@ libdns_sd.so.1 avahi-compat-libs-0.6.25_1
libhowl.so.0 avahi-compat-libs-0.6.25_1
libavahi-ui.so.0 avahi-ui-libs-0.6.25_1
libavahi-ui-gtk3.so.0 avahi-ui-libs-gtk3-0.6.25_1
+libavahi-libevent.so.1 avahi-libevent-libs-0.8_1
libmp4v2.so.2 libmp4v2-2.0.0_1
libfaac.so.0 faac-1.28_1
libfaad.so.2 faad2-2.7_1
diff --git a/srcpkgs/avahi-libevent-libs b/srcpkgs/avahi-libevent-libs
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-libevent-libs
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-libevent-libs-devel b/srcpkgs/avahi-libevent-libs-devel
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-libevent-libs-devel
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 199cbd4e057..29880997a8f 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,26 +1,34 @@
# Template file for 'avahi'
pkgname=avahi
-version=0.7
-revision=9
+version=0.8
+revision=1
build_style=gnu-configure
-configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
- --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
- --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
+configure_args="--disable-qt3 --disable-qt4 --disable-qt5
+ --disable-mono --disable-monodoc --disable-doxygen-doc
+ --enable-compat-libdns_sd --enable-compat-howl --with-xml=expat
+ --with-avahi-user=avahi --with-avahi-group=avahi
--with-avahi-priv-access-group=network --with-autoipd-user=avahi
--with-autoipd-group=avahi --with-distro=none --disable-xmltoman
- --disable-static ssp_cv_lib=no --enable-python
+ --disable-static ssp_cv_lib=no --enable-python --disable-pygobject
--disable-glib --disable-python-dbus --disable-gobject --disable-gtk
--disable-gtk3 --disable-dbm --disable-introspection --sbindir=/usr/bin
- --disable-pygobject"
+ --without-systemdsystemunitdir
+ --with-dbus-system-address=unix:path=/run/dbus/system_bus_socket"
short_desc="Multicast DNS Service Discovery"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/lathiat/avahi"
-distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
-checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
+### NOTE: The Avahi 0.8 release tarball is broken; it is missing the build-db
+### script. Fetching and manipulation of this file in post_extract should be
+### undone in a future release that fixes this oversight.
+distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz
+ https://raw.githubusercontent.com/lathiat/${pkgname}/v${version}/service-type-database/build-db>build-db.txt"
+checksum="060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
+ 83edd888ccc464ab032134a45b7ded3bc43cb1dda2cd921ff47b01949d98ed7c"
+skip_extraction="build-db.txt"
-hostmakedepends="pkg-config intltool python"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
+hostmakedepends="pkg-config intltool python3"
+makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel libevent-devel"
conf_files="
/etc/avahi/services/ssh.service
/etc/avahi/services/sftp-ssh.service
@@ -30,16 +38,17 @@ conf_files="
system_accounts="avahi:23"
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" automake libtool glib-devel"
+ hostmakedepends+=" automake libtool glib-devel gettext-devel"
pre_configure() {
autoreconf -if
}
fi
post_extract() {
- # Switch to /run to not depend on /var/run being a symlink.
- sed -e 's,\(avahi_runtime_dir=\).*,\1\"/run\",' -i ${wrksrc}/configure
+ # Avahi 0.8 release mistaken left build-db out of release tarball
+ cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/build-db.txt service-type-database/build-db
}
+
post_install() {
rm -rf ${DESTDIR}/usr/lib/python*
# Set 'enable-dbus=warn' option by default to not require dbus.
@@ -104,3 +113,18 @@ avahi-utils_package() {
vmove usr/share/man/man1
}
}
+avahi-libevent-libs_package() {
+ short_desc="Avahi libevent integration libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-libevent.so.*"
+ }
+}
+avahi-libevent-libs-devel_package() {
+ depends="avahi-libs-devel-${version}_${revision} avahi-libevent-libs-${version}_${revision}"
+ short_desc="Avahi libevent integration libraries - development files"
+ pkg_install() {
+ vmove usr/lib/libavahi-libevent.so
+ vmove "usr/include/avahi-libevent*"
+ vmove "usr/lib/pkgconfig/avahi-libevent*"
+ }
+}
From b6cae411dce630b36f11fe30e59ac19edd4eb8a0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 7 May 2020 16:42:05 -0400
Subject: [PATCH 2/2] avahi-discover: update to 0.8.
---
common/shlibs | 1 +
srcpkgs/avahi-discover/template | 86 +++++++++++++++++++++++++--------
srcpkgs/avahi-python3 | 1 +
srcpkgs/avahi-python3-utils | 1 +
srcpkgs/avahi-qt5-libs | 1 +
srcpkgs/avahi-qt5-libs-devel | 1 +
6 files changed, 72 insertions(+), 19 deletions(-)
create mode 120000 srcpkgs/avahi-python3
create mode 120000 srcpkgs/avahi-python3-utils
create mode 120000 srcpkgs/avahi-qt5-libs
create mode 120000 srcpkgs/avahi-qt5-libs-devel
diff --git a/common/shlibs b/common/shlibs
index 57b9428e969..23b557f188f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -390,6 +390,7 @@ libhowl.so.0 avahi-compat-libs-0.6.25_1
libavahi-ui.so.0 avahi-ui-libs-0.6.25_1
libavahi-ui-gtk3.so.0 avahi-ui-libs-gtk3-0.6.25_1
libavahi-libevent.so.1 avahi-libevent-libs-0.8_1
+libavahi-qt5.so.1 avahi-qt5-libs-0.8_1
libmp4v2.so.2 libmp4v2-2.0.0_1
libfaac.so.0 faac-1.28_1
libfaad.so.2 faad2-2.7_1
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 4387c1d584c..432a254234b 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -4,8 +4,8 @@
# ADDITIONAL DEPENDENCIES LIKE GTK3 AND PyGI.
#
pkgname=avahi-discover
-version=0.7
-revision=8
+version=0.8
+revision=1
wrksrc="avahi-${version}"
build_style=gnu-configure
build_helper="gir"
@@ -13,25 +13,26 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
--disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
--with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
--with-avahi-priv-access-group=network --with-autoipd-user=avahi
- --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
- --disable-dbm --without-systemdsystemunitdir
- --disable-static ssp_cv_lib=no --enable-python
+ --with-autoipd-group=avahi --with-distro=none --disable-dbm
+ --disable-static ssp_cv_lib=no --enable-python --enable-xmltoman
--enable-glib --enable-gobject --enable-gtk --enable-gtk3
- $(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
+ $(vopt_enable gir introspection) $(vopt_enable gir pygobject)
+ --enable-qt5 --without-systemdsystemunitdir
+ --with-dbus-system-address=unix:path=/run/dbus/system_bus_socket"
short_desc="Service discover user interface for avahi"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/lathiat/avahi"
distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
-checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
+checksum=060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
-hostmakedepends="automake libtool pkg-config intltool
- python-dbus gobject-introspection glib-devel"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
- python-dbus gtk+-devel gtk+3-devel $(vopt_if gir python-gobject-devel)"
-depends="avahi>=${version} avahi-python>=${version}
- $(vopt_if gir 'gtk+3 python-gobject') desktop-file-utils"
-pycompile_module="avahi_discover"
+hostmakedepends="automake libtool pkg-config intltool xmltoman
+ python3-dbus gobject-introspection glib-devel gettext-devel qt5-host-tools"
+makedepends="dbus-devel libcap-devel libdaemon-devel libevent-devel gdbm-devel
+ python3-dbus gtk+-devel gtk+3-devel qt5-devel $(vopt_if gir python3-gobject-devel)"
+depends="avahi>=${version} avahi-python3>=${version}
+ $(vopt_if gir 'gtk+3 python3-gobject') desktop-file-utils"
+python_version=3
# Package build options
build_options="gir"
@@ -42,6 +43,13 @@ pre_configure() {
sed -e 's,-Werror,,g' -i configure
}
+post_configure() {
+ ### WARNING: The Avahi 0.8 RELEASE TARBALL IS MISSING A SCRIPT IN
+ ### THE service-type-database DIRECTORY THAT WILL CAUSE A BUILD FAILURE;
+ ### WORK AROUND THIS BY NOT BUILDING THAT SUBDIRECTORY
+ vsed -i Makefile -e 's/\bservice-type-database\b//g'
+}
+
do_install() {
mkdir -p ${wrksrc}/tmpinstall/usr/lib
ln -s lib ${wrksrc}/tmpinstall/usr/lib32
@@ -66,11 +74,18 @@ do_install() {
fi
done
mv ${wrksrc}/tmpinstall/usr/include/avahi-g* ${DESTDIR}/usr/include
+ mv ${wrksrc}/tmpinstall/usr/include/avahi-qt* ${DESTDIR}/usr/include
mv ${wrksrc}/tmpinstall/usr/include/avahi-ui* ${DESTDIR}/usr/include
- mv ${wrksrc}/tmpinstall/usr/lib/python2.7 ${DESTDIR}/usr/lib
+
+ # Python files are compatible with both 2.7 and 3.x
+ cp -r ${wrksrc}/tmpinstall/usr/lib/python3.8 ${DESTDIR}/usr/lib/python2.7
+ mv ${wrksrc}/tmpinstall/usr/lib/python3.8 ${DESTDIR}/usr/lib
+
mv ${wrksrc}/tmpinstall/usr/lib/*avahi-g* ${DESTDIR}/usr/lib
mv ${wrksrc}/tmpinstall/usr/lib/*avahi-ui* ${DESTDIR}/usr/lib
+ mv ${wrksrc}/tmpinstall/usr/lib/*avahi-qt* ${DESTDIR}/usr/lib
mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-g* ${DESTDIR}/usr/lib/pkgconfig
+ mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-qt* ${DESTDIR}/usr/lib/pkgconfig
mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-ui* ${DESTDIR}/usr/lib/pkgconfig
mv ${wrksrc}/tmpinstall/usr/share/avahi/interfaces/*.ui ${DESTDIR}/usr/share/avahi/interfaces
if [ "$build_option_gir" ]; then
@@ -80,9 +95,17 @@ do_install() {
}
avahi-python-utils_package() {
- depends="avahi-python>=$version"
+ build_style=meta
+ archs=noarch
+ short_desc+="Avahi python utilities - transitional dummy pkg"
+ depends="avahi-python3-utils-${version}_${revision}"
+}
+
+avahi-python3-utils_package() {
+ depends="avahi-python3>=$version"
short_desc="Avahi python utilities"
archs=noarch
+ python_version=3
pkg_install() {
vmove usr/bin/avahi-bookmarks
vmove "usr/share/man/man1/avahi-bookmarks*"
@@ -93,9 +116,17 @@ avahi-python_package() {
depends="python-dbus"
short_desc="Python utility package for Avahi"
archs=noarch
- pycompile_module="avahi"
pkg_install() {
- vmove usr/lib/python2.7/site-packages/avahi
+ vmove ${py2_sitelib}/avahi
+ }
+}
+
+avahi-python3_package() {
+ depends="python3-dbus"
+ short_desc="Python3 utility package for Avahi"
+ archs=noarch
+ pkg_install() {
+ vmove ${py3_sitelib}/avahi
}
}
@@ -137,6 +168,23 @@ avahi-ui-libs-devel_package() {
}
}
+avahi-qt5-libs_package() {
+ short_desc="Avahi Qt5 shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-qt5.so.*"
+ }
+}
+
+avahi-qt5-libs-devel_package() {
+ depends="qt5-devel avahi-libs-devel>=${version}_${revision}"
+ short_desc="Avahi QT5 shared libraries - development files"
+ pkg_install() {
+ vmove usr/lib/pkgconfig/avahi-qt5.pc
+ vmove usr/lib/libavahi-qt5.so
+ vmove usr/include/avahi-qt5
+ }
+}
+
avahi-ui-libs-gtk3_package() {
short_desc="Avahi UI GTK+3 shared libraries"
pkg_install() {
diff --git a/srcpkgs/avahi-python3 b/srcpkgs/avahi-python3
new file mode 120000
index 00000000000..19fb54cd099
--- /dev/null
+++ b/srcpkgs/avahi-python3
@@ -0,0 +1 @@
+avahi-discover
\ No newline at end of file
diff --git a/srcpkgs/avahi-python3-utils b/srcpkgs/avahi-python3-utils
new file mode 120000
index 00000000000..19fb54cd099
--- /dev/null
+++ b/srcpkgs/avahi-python3-utils
@@ -0,0 +1 @@
+avahi-discover
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs b/srcpkgs/avahi-qt5-libs
new file mode 120000
index 00000000000..19fb54cd099
--- /dev/null
+++ b/srcpkgs/avahi-qt5-libs
@@ -0,0 +1 @@
+avahi-discover
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs-devel b/srcpkgs/avahi-qt5-libs-devel
new file mode 120000
index 00000000000..19fb54cd099
--- /dev/null
+++ b/srcpkgs/avahi-qt5-libs-devel
@@ -0,0 +1 @@
+avahi-discover
\ No newline at end of file
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Update avahi, take ownership
2020-05-07 20:53 [PR PATCH] Update avahi, take ownership ahesford
@ 2020-05-09 16:35 ` ahesford
2020-05-09 16:40 ` ahesford
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ahesford @ 2020-05-09 16:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 788 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages avahi
https://github.com/void-linux/void-packages/pull/21731
Update avahi, take ownership
This brings avahi and its subpackages up to date. Included are new libraries to incorporate avahi with libevent or qt5, as new subpackages. Also, the Python parts of avahi are compatible with py3, so there are new `-python3` subpackages as appropriate. The `avahi-python` package is still usable with py2 and has been preserved; `avahi-python-utils` is now an empty meta to bring in the new `avahi-python3-utils`, as the contents of the newer package supplant the older.
A patch file from https://github.com/void-linux/void-packages/pull/21731.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-avahi-21731.patch --]
[-- Type: text/x-diff, Size: 21072 bytes --]
From 183b952724ad6768db81122889a9533f6a88629d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 7 May 2020 14:47:34 -0400
Subject: [PATCH] avahi: update to 0.8, unify with avahi-discover [ci skip]
---
common/shlibs | 2 +
srcpkgs/avahi-discover | 1 +
srcpkgs/avahi-discover/template | 169 ----------------------
srcpkgs/avahi-discover/update | 1 -
srcpkgs/avahi-glib-libs | 2 +-
srcpkgs/avahi-glib-libs-devel | 2 +-
srcpkgs/avahi-libevent-libs | 1 +
srcpkgs/avahi-libevent-libs-devel | 1 +
srcpkgs/avahi-python | 2 +-
srcpkgs/avahi-python-utils | 2 +-
srcpkgs/avahi-python3 | 1 +
srcpkgs/avahi-python3-utils | 1 +
srcpkgs/avahi-qt5-libs | 1 +
srcpkgs/avahi-qt5-libs-devel | 1 +
srcpkgs/avahi-ui-libs | 2 +-
srcpkgs/avahi-ui-libs-devel | 2 +-
srcpkgs/avahi-ui-libs-gtk3 | 2 +-
srcpkgs/avahi-ui-utils | 2 +-
srcpkgs/avahi/template | 223 ++++++++++++++++++++++++++----
19 files changed, 216 insertions(+), 202 deletions(-)
create mode 120000 srcpkgs/avahi-discover
delete mode 100644 srcpkgs/avahi-discover/template
delete mode 100644 srcpkgs/avahi-discover/update
create mode 120000 srcpkgs/avahi-libevent-libs
create mode 120000 srcpkgs/avahi-libevent-libs-devel
create mode 120000 srcpkgs/avahi-python3
create mode 120000 srcpkgs/avahi-python3-utils
create mode 120000 srcpkgs/avahi-qt5-libs
create mode 120000 srcpkgs/avahi-qt5-libs-devel
diff --git a/common/shlibs b/common/shlibs
index 8342e117092..c9a76f6cc5d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -389,6 +389,8 @@ libdns_sd.so.1 avahi-compat-libs-0.6.25_1
libhowl.so.0 avahi-compat-libs-0.6.25_1
libavahi-ui.so.0 avahi-ui-libs-0.6.25_1
libavahi-ui-gtk3.so.0 avahi-ui-libs-gtk3-0.6.25_1
+libavahi-libevent.so.1 avahi-libevent-libs-0.8_1
+libavahi-qt5.so.1 avahi-qt5-libs-0.8_1
libmp4v2.so.2 libmp4v2-2.0.0_1
libfaac.so.0 faac-1.28_1
libfaad.so.2 faad2-2.7_1
diff --git a/srcpkgs/avahi-discover b/srcpkgs/avahi-discover
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-discover
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
deleted file mode 100644
index 4387c1d584c..00000000000
--- a/srcpkgs/avahi-discover/template
+++ /dev/null
@@ -1,169 +0,0 @@
-# Template file for 'avahi-discover'
-#
-# WARNING: THIS TEMPLATE MUST BE SYNCHRONIZED WITH AVAHI. IT IS SPLITTED TO DROP
-# ADDITIONAL DEPENDENCIES LIKE GTK3 AND PyGI.
-#
-pkgname=avahi-discover
-version=0.7
-revision=8
-wrksrc="avahi-${version}"
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
- --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
- --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
- --with-avahi-priv-access-group=network --with-autoipd-user=avahi
- --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
- --disable-dbm --without-systemdsystemunitdir
- --disable-static ssp_cv_lib=no --enable-python
- --enable-glib --enable-gobject --enable-gtk --enable-gtk3
- $(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
-short_desc="Service discover user interface for avahi"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/lathiat/avahi"
-distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
-checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
-
-hostmakedepends="automake libtool pkg-config intltool
- python-dbus gobject-introspection glib-devel"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
- python-dbus gtk+-devel gtk+3-devel $(vopt_if gir python-gobject-devel)"
-depends="avahi>=${version} avahi-python>=${version}
- $(vopt_if gir 'gtk+3 python-gobject') desktop-file-utils"
-pycompile_module="avahi_discover"
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_configure() {
- autoreconf -fi
- sed -e 's,-Werror,,g' -i configure
-}
-
-do_install() {
- mkdir -p ${wrksrc}/tmpinstall/usr/lib
- ln -s lib ${wrksrc}/tmpinstall/usr/lib32
-
- make DESTDIR=${wrksrc}/tmpinstall install
-
- # Move all required files to ${DESTDIR} now...
- vmkdir usr/bin
- vmkdir usr/share/man/man1
- vmkdir usr/share/applications
- vmkdir usr/include
- vmkdir usr/lib/pkgconfig
- vmkdir usr/share/avahi/interfaces
-
- for f in bvnc bssh bshell avahi-bookmarks $(vopt_if gir avahi-discover) $(vopt_if gir avahi-discover-standalone); do
- mv ${wrksrc}/tmpinstall/usr/bin/${f} ${DESTDIR}/usr/bin
- if [ -f ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ]; then
- mv ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ${DESTDIR}/usr/share/man/man1
- fi
- if [ -f ${wrksrc}/tmpinstall/usr/share/applications/${f}.desktop ]; then
- mv ${wrksrc}/tmpinstall/usr/share/applications/${f}.desktop ${DESTDIR}/usr/share/applications
- fi
- done
- mv ${wrksrc}/tmpinstall/usr/include/avahi-g* ${DESTDIR}/usr/include
- mv ${wrksrc}/tmpinstall/usr/include/avahi-ui* ${DESTDIR}/usr/include
- mv ${wrksrc}/tmpinstall/usr/lib/python2.7 ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/*avahi-g* ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/*avahi-ui* ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-g* ${DESTDIR}/usr/lib/pkgconfig
- mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-ui* ${DESTDIR}/usr/lib/pkgconfig
- mv ${wrksrc}/tmpinstall/usr/share/avahi/interfaces/*.ui ${DESTDIR}/usr/share/avahi/interfaces
- if [ "$build_option_gir" ]; then
- mv ${wrksrc}/tmpinstall/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/share/gir-1.0 ${DESTDIR}/usr/share
- fi
-}
-
-avahi-python-utils_package() {
- depends="avahi-python>=$version"
- short_desc="Avahi python utilities"
- archs=noarch
- pkg_install() {
- vmove usr/bin/avahi-bookmarks
- vmove "usr/share/man/man1/avahi-bookmarks*"
- }
-}
-
-avahi-python_package() {
- depends="python-dbus"
- short_desc="Python utility package for Avahi"
- archs=noarch
- pycompile_module="avahi"
- pkg_install() {
- vmove usr/lib/python2.7/site-packages/avahi
- }
-}
-
-avahi-glib-libs-devel_package() {
- depends="avahi-libs-devel>=${version}_${revision} avahi-glib-libs>=${version}_${revision}"
- short_desc="Avahi glib libraries - development files"
- pkg_install() {
- vmove "usr/include/avahi-g*"
- vmove "usr/lib/pkgconfig/avahi-g*"
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- vmove usr/lib/libavahi-glib.so
- vmove usr/lib/libavahi-gobject.so
- }
-}
-
-avahi-glib-libs_package() {
- short_desc="Avahi glib shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-glib.so.*"
- vmove "usr/lib/libavahi-gobject.so.*"
- if [ "$build_option_gir" ]; then
- vmove usr/lib/girepository-1.0
- fi
- }
-}
-
-avahi-ui-libs-devel_package() {
- depends="gtk+-devel gtk+3-devel avahi-libs-devel>=${version}_${revision}
- avahi-ui-libs>=${version}_${revision} avahi-ui-libs-gtk3>=${version}_${revision}"
- short_desc="Avahi UI libraries - development files"
- pkg_install() {
- vmove usr/include/avahi-ui/avahi-ui.h
- vmove usr/lib/pkgconfig/avahi-ui.pc
- vmove usr/lib/pkgconfig/avahi-ui-gtk3.pc
- vmove usr/lib/libavahi-ui-gtk3.so
- vmove usr/lib/libavahi-ui.so
- }
-}
-
-avahi-ui-libs-gtk3_package() {
- short_desc="Avahi UI GTK+3 shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-ui-gtk3.so.*"
- }
-}
-
-avahi-ui-libs_package() {
- short_desc="Avahi UI shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-ui.so.*"
- }
-}
-
-avahi-ui-utils_package() {
- depends="desktop-file-utils avahi>=$version"
- short_desc="Avahi GTK+ utilities"
- pkg_install() {
- vmove usr/share/applications/bvnc.desktop
- vmove usr/share/applications/bssh.desktop
- vmove usr/share/man/man1/bssh.1
- if [ "$build_option_gir" ]; then
- vmove usr/bin/avahi-discover-standalone
- fi
- vmove usr/bin/bssh
- vmove usr/share/man/man1/bvnc.1
- vmove usr/bin/bvnc
- vmove usr/bin/bshell
- }
-}
diff --git a/srcpkgs/avahi-discover/update b/srcpkgs/avahi-discover/update
deleted file mode 100644
index b8bee1a9ab5..00000000000
--- a/srcpkgs/avahi-discover/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="avahi"
diff --git a/srcpkgs/avahi-glib-libs b/srcpkgs/avahi-glib-libs
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-glib-libs
+++ b/srcpkgs/avahi-glib-libs
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-glib-libs-devel b/srcpkgs/avahi-glib-libs-devel
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-glib-libs-devel
+++ b/srcpkgs/avahi-glib-libs-devel
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-libevent-libs b/srcpkgs/avahi-libevent-libs
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-libevent-libs
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-libevent-libs-devel b/srcpkgs/avahi-libevent-libs-devel
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-libevent-libs-devel
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python b/srcpkgs/avahi-python
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-python
+++ b/srcpkgs/avahi-python
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python-utils b/srcpkgs/avahi-python-utils
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-python-utils
+++ b/srcpkgs/avahi-python-utils
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python3 b/srcpkgs/avahi-python3
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-python3
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python3-utils b/srcpkgs/avahi-python3-utils
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-python3-utils
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs b/srcpkgs/avahi-qt5-libs
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-qt5-libs
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs-devel b/srcpkgs/avahi-qt5-libs-devel
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-qt5-libs-devel
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs b/srcpkgs/avahi-ui-libs
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs
+++ b/srcpkgs/avahi-ui-libs
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs-devel b/srcpkgs/avahi-ui-libs-devel
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs-devel
+++ b/srcpkgs/avahi-ui-libs-devel
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs-gtk3 b/srcpkgs/avahi-ui-libs-gtk3
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs-gtk3
+++ b/srcpkgs/avahi-ui-libs-gtk3
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-utils b/srcpkgs/avahi-ui-utils
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-utils
+++ b/srcpkgs/avahi-ui-utils
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 199cbd4e057..dd3dd471963 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,26 +1,38 @@
# Template file for 'avahi'
pkgname=avahi
-version=0.7
-revision=9
+version=0.8
+revision=1
build_style=gnu-configure
+build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
- --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
- --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
- --with-avahi-priv-access-group=network --with-autoipd-user=avahi
- --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
- --disable-static ssp_cv_lib=no --enable-python
- --disable-glib --disable-python-dbus --disable-gobject --disable-gtk
- --disable-gtk3 --disable-dbm --disable-introspection --sbindir=/usr/bin
- --disable-pygobject"
+ --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
+ --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
+ --with-avahi-priv-access-group=network --with-autoipd-user=avahi
+ --with-autoipd-group=avahi --with-distro=none --enable-xmltoman
+ --disable-static ssp_cv_lib=no --disable-dbm --enable-python
+ --enable-glib --enable-gobject --enable-qt5 --enable-gtk --enable-gtk3
+ --sbindir=/usr/bin --without-systemdsystemunitdir
+ --with-dbus-system-address=unix:path=/run/dbus/system_bus_socket
+ $(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
short_desc="Multicast DNS Service Discovery"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/lathiat/avahi"
-distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
-checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
+### NOTE: The Avahi 0.8 release tarball is broken; it is missing the build-db
+### script. Fetching and manipulation of this file in post_extract should be
+### undone in a future release that fixes this oversight.
+distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz
+ https://raw.githubusercontent.com/lathiat/${pkgname}/v${version}/service-type-database/build-db>build-db.txt"
+checksum="060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
+ 83edd888ccc464ab032134a45b7ded3bc43cb1dda2cd921ff47b01949d98ed7c"
+skip_extraction="build-db.txt"
-hostmakedepends="pkg-config intltool python"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
+hostmakedepends="pkg-config intltool xmltoman glib-devel automake
+ libtool gettext-devel python3 python3-dbus qt5-host-tools
+ $(vopt_if gir gobject-introspection)"
+makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
+ libevent-devel glib-devel python3-dbus gtk+-devel
+ gtk+3-devel qt5-devel $(vopt_if gir python-gobject-devel)"
conf_files="
/etc/avahi/services/ssh.service
/etc/avahi/services/sftp-ssh.service
@@ -29,22 +41,26 @@ conf_files="
/etc/avahi/avahi-dnsconfd.action"
system_accounts="avahi:23"
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" automake libtool glib-devel"
- pre_configure() {
- autoreconf -if
- }
-fi
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+ autoreconf -if
+}
post_extract() {
- # Switch to /run to not depend on /var/run being a symlink.
- sed -e 's,\(avahi_runtime_dir=\).*,\1\"/run\",' -i ${wrksrc}/configure
+ # Avahi 0.8 release mistaken left build-db out of release tarball
+ cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/build-db.txt service-type-database/build-db
}
+
post_install() {
- rm -rf ${DESTDIR}/usr/lib/python*
# Set 'enable-dbus=warn' option by default to not require dbus.
sed -e 's,\#\(enable-dbus\).*,\1=warn,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf
vsv avahi-daemon
+
+ # Python files are compatible with both 2.7 and 3.x, make both subpackages
+ vmkdir ${py2_lib}
+ vcopy ${DESTDIR}/${py3_sitelib} ${py2_lib}
}
avahi-autoipd_package() {
@@ -56,6 +72,7 @@ avahi-autoipd_package() {
vmove etc/avahi/avahi-autoipd.action
}
}
+
avahi-compat-libs-devel_package() {
depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}"
short_desc="Avahi compat libraries - development files"
@@ -66,6 +83,7 @@ avahi-compat-libs-devel_package() {
vmove usr/lib/libdns_sd.so
}
}
+
avahi-compat-libs_package() {
short_desc="Avahi compatiblity shared libraries"
pkg_install() {
@@ -73,6 +91,7 @@ avahi-compat-libs_package() {
vmove "usr/lib/libdns_sd.so.*"
}
}
+
avahi-libs-devel_package() {
depends="dbus-devel avahi-libs-${version}_${revision}"
short_desc="Avahi core libraries - development files"
@@ -87,6 +106,7 @@ avahi-libs-devel_package() {
vmove usr/lib/libavahi-common.so
}
}
+
avahi-libs_package() {
short_desc="Avahi shared libraries"
pkg_install() {
@@ -95,6 +115,7 @@ avahi-libs_package() {
vmove "usr/lib/libavahi-common.so.*"
}
}
+
avahi-utils_package() {
short_desc="Avahi browsing, publishing and discovery utilities"
pkg_install() {
@@ -104,3 +125,157 @@ avahi-utils_package() {
vmove usr/share/man/man1
}
}
+
+avahi-libevent-libs_package() {
+ short_desc="Avahi libevent integration libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-libevent.so.*"
+ }
+}
+
+avahi-libevent-libs-devel_package() {
+ depends="avahi-libs-devel-${version}_${revision} avahi-libevent-libs-${version}_${revision}"
+ short_desc="Avahi libevent integration libraries - development files"
+ pkg_install() {
+ vmove usr/lib/libavahi-libevent.so
+ vmove "usr/include/avahi-libevent*"
+ vmove "usr/lib/pkgconfig/avahi-libevent*"
+ }
+}
+
+avahi-discover_package() {
+ short_desc="Avahi service-discovery user interface"
+ depends="avahi>=${version}_${revision} avahi-python3>=${version}_${revision}
+ $(vopt_if gir 'gtk+3 python3-gobject')"
+ python_version=3
+ pkg_install() {
+ if [ "$build_option_gir" ]; then
+ vmove usr/bin/avahi-discover
+ vmove usr/share/applications/avahi-discover.desktop
+ fi
+ vmove usr/share/avahi/interfaces/avahi-discover.ui
+ vmove usr/share/man/man1/avahi-discover.1
+ }
+}
+
+avahi-python-utils_package() {
+ build_style=meta
+ archs=noarch
+ short_desc+="Avahi python utilities - transitional dummy pkg"
+ depends="avahi-python3-utils-${version}_${revision}"
+}
+
+avahi-python3-utils_package() {
+ depends="avahi-python3>=${version}_${revision}"
+ short_desc="Avahi python utilities"
+ archs=noarch
+ python_version=3
+ pkg_install() {
+ vmove usr/bin/avahi-bookmarks
+ vmove usr/share/man/man1/avahi-bookmarks.1
+ }
+}
+
+avahi-python_package() {
+ depends="python-dbus"
+ short_desc="Python utility package for Avahi"
+ archs=noarch
+ pkg_install() {
+ vmove ${py2_sitelib}/avahi
+ }
+}
+
+avahi-python3_package() {
+ depends="python3-dbus"
+ short_desc="Python3 utility package for Avahi"
+ archs=noarch
+ pkg_install() {
+ vmove ${py3_sitelib}/avahi
+ }
+}
+
+avahi-glib-libs-devel_package() {
+ depends="avahi-libs-devel>=${version}_${revision} avahi-glib-libs>=${version}_${revision}"
+ short_desc="Avahi glib libraries - development files"
+ pkg_install() {
+ vmove "usr/include/avahi-g*"
+ vmove "usr/lib/pkgconfig/avahi-g*"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ vmove usr/lib/libavahi-glib.so
+ vmove usr/lib/libavahi-gobject.so
+ }
+}
+
+avahi-glib-libs_package() {
+ short_desc="Avahi glib shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-glib.so.*"
+ vmove "usr/lib/libavahi-gobject.so.*"
+ if [ "$build_option_gir" ]; then
+ vmove usr/lib/girepository-1.0
+ fi
+ }
+}
+
+avahi-ui-libs-devel_package() {
+ depends="gtk+-devel gtk+3-devel avahi-libs-devel>=${version}_${revision}
+ avahi-ui-libs>=${version}_${revision} avahi-ui-libs-gtk3>=${version}_${revision}"
+ short_desc="Avahi UI libraries - development files"
+ pkg_install() {
+ vmove usr/include/avahi-ui/avahi-ui.h
+ vmove usr/lib/pkgconfig/avahi-ui.pc
+ vmove usr/lib/pkgconfig/avahi-ui-gtk3.pc
+ vmove usr/lib/libavahi-ui-gtk3.so
+ vmove usr/lib/libavahi-ui.so
+ }
+}
+
+avahi-qt5-libs_package() {
+ short_desc="Avahi Qt5 shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-qt5.so.*"
+ }
+}
+
+avahi-qt5-libs-devel_package() {
+ depends="qt5-devel avahi-libs-devel>=${version}_${revision} avahi-qt5-libs>=${version}_${revision}"
+ short_desc="Avahi QT5 shared libraries - development files"
+ pkg_install() {
+ vmove usr/lib/pkgconfig/avahi-qt5.pc
+ vmove usr/lib/libavahi-qt5.so
+ vmove usr/include/avahi-qt5
+ }
+}
+
+avahi-ui-libs-gtk3_package() {
+ short_desc="Avahi UI GTK+3 shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-ui-gtk3.so.*"
+ }
+}
+
+avahi-ui-libs_package() {
+ short_desc="Avahi UI shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-ui.so.*"
+ }
+}
+
+avahi-ui-utils_package() {
+ depends="desktop-file-utils avahi>=$version"
+ short_desc="Avahi GTK+ utilities"
+ pkg_install() {
+ vmove usr/share/applications/bvnc.desktop
+ vmove usr/share/applications/bssh.desktop
+ vmove usr/share/man/man1/bssh.1
+ if [ "$build_option_gir" ]; then
+ vmove usr/bin/avahi-discover-standalone
+ fi
+ vmove usr/bin/bssh
+ vmove usr/share/man/man1/bvnc.1
+ vmove usr/bin/bvnc
+ vmove usr/bin/bshell
+ }
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Update avahi, take ownership
2020-05-07 20:53 [PR PATCH] Update avahi, take ownership ahesford
2020-05-09 16:35 ` [PR PATCH] [Updated] " ahesford
@ 2020-05-09 16:40 ` ahesford
2020-05-09 21:14 ` ahesford
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ahesford @ 2020-05-09 16:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages avahi
https://github.com/void-linux/void-packages/pull/21731
Update avahi, take ownership
This brings avahi and its subpackages up to date. Included are new libraries to incorporate avahi with libevent or qt5, as new subpackages. Also, the Python parts of avahi are compatible with py3, so there are new `-python3` subpackages as appropriate. The `avahi-python` package is still usable with py2 and has been preserved; `avahi-python-utils` is now an empty meta to bring in the new `avahi-python3-utils`, as the contents of the newer package supplant the older.
EDIT: I've also unified the `avahi-discover` and `avahi` templates. They were separate to avoid dependencies like `gtk+3` in the base packages. However, I've double-checked the dependencies when building all of the subpackages from one template, and these extra dependencies do not leak into the base package. The unification makes maintenance easier and saves build time, because now `avahi-discover` and its subpackages can just copy files from the `avahi` build rather than rebuilding everything (with the potential for mismatched build options) a second time just to extract the UI bits.
A patch file from https://github.com/void-linux/void-packages/pull/21731.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-avahi-21731.patch --]
[-- Type: text/x-diff, Size: 21136 bytes --]
From 6c8c99d65ab5adab0ecd22c0da2ce5b4131a153f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 7 May 2020 14:47:34 -0400
Subject: [PATCH] avahi: update to 0.8, unify with avahi-discover [ci skip]
---
common/shlibs | 2 +
srcpkgs/avahi-discover | 1 +
srcpkgs/avahi-discover/template | 169 ----------------------
srcpkgs/avahi-discover/update | 1 -
srcpkgs/avahi-glib-libs | 2 +-
srcpkgs/avahi-glib-libs-devel | 2 +-
srcpkgs/avahi-libevent-libs | 1 +
srcpkgs/avahi-libevent-libs-devel | 1 +
srcpkgs/avahi-python | 2 +-
srcpkgs/avahi-python-utils | 2 +-
srcpkgs/avahi-python3 | 1 +
srcpkgs/avahi-python3-utils | 1 +
srcpkgs/avahi-qt5-libs | 1 +
srcpkgs/avahi-qt5-libs-devel | 1 +
srcpkgs/avahi-ui-libs | 2 +-
srcpkgs/avahi-ui-libs-devel | 2 +-
srcpkgs/avahi-ui-libs-gtk3 | 2 +-
srcpkgs/avahi-ui-utils | 2 +-
srcpkgs/avahi/template | 224 ++++++++++++++++++++++++++----
19 files changed, 217 insertions(+), 202 deletions(-)
create mode 120000 srcpkgs/avahi-discover
delete mode 100644 srcpkgs/avahi-discover/template
delete mode 100644 srcpkgs/avahi-discover/update
create mode 120000 srcpkgs/avahi-libevent-libs
create mode 120000 srcpkgs/avahi-libevent-libs-devel
create mode 120000 srcpkgs/avahi-python3
create mode 120000 srcpkgs/avahi-python3-utils
create mode 120000 srcpkgs/avahi-qt5-libs
create mode 120000 srcpkgs/avahi-qt5-libs-devel
diff --git a/common/shlibs b/common/shlibs
index 8342e117092..c9a76f6cc5d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -389,6 +389,8 @@ libdns_sd.so.1 avahi-compat-libs-0.6.25_1
libhowl.so.0 avahi-compat-libs-0.6.25_1
libavahi-ui.so.0 avahi-ui-libs-0.6.25_1
libavahi-ui-gtk3.so.0 avahi-ui-libs-gtk3-0.6.25_1
+libavahi-libevent.so.1 avahi-libevent-libs-0.8_1
+libavahi-qt5.so.1 avahi-qt5-libs-0.8_1
libmp4v2.so.2 libmp4v2-2.0.0_1
libfaac.so.0 faac-1.28_1
libfaad.so.2 faad2-2.7_1
diff --git a/srcpkgs/avahi-discover b/srcpkgs/avahi-discover
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-discover
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
deleted file mode 100644
index 4387c1d584c..00000000000
--- a/srcpkgs/avahi-discover/template
+++ /dev/null
@@ -1,169 +0,0 @@
-# Template file for 'avahi-discover'
-#
-# WARNING: THIS TEMPLATE MUST BE SYNCHRONIZED WITH AVAHI. IT IS SPLITTED TO DROP
-# ADDITIONAL DEPENDENCIES LIKE GTK3 AND PyGI.
-#
-pkgname=avahi-discover
-version=0.7
-revision=8
-wrksrc="avahi-${version}"
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
- --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
- --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
- --with-avahi-priv-access-group=network --with-autoipd-user=avahi
- --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
- --disable-dbm --without-systemdsystemunitdir
- --disable-static ssp_cv_lib=no --enable-python
- --enable-glib --enable-gobject --enable-gtk --enable-gtk3
- $(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
-short_desc="Service discover user interface for avahi"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/lathiat/avahi"
-distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
-checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
-
-hostmakedepends="automake libtool pkg-config intltool
- python-dbus gobject-introspection glib-devel"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
- python-dbus gtk+-devel gtk+3-devel $(vopt_if gir python-gobject-devel)"
-depends="avahi>=${version} avahi-python>=${version}
- $(vopt_if gir 'gtk+3 python-gobject') desktop-file-utils"
-pycompile_module="avahi_discover"
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_configure() {
- autoreconf -fi
- sed -e 's,-Werror,,g' -i configure
-}
-
-do_install() {
- mkdir -p ${wrksrc}/tmpinstall/usr/lib
- ln -s lib ${wrksrc}/tmpinstall/usr/lib32
-
- make DESTDIR=${wrksrc}/tmpinstall install
-
- # Move all required files to ${DESTDIR} now...
- vmkdir usr/bin
- vmkdir usr/share/man/man1
- vmkdir usr/share/applications
- vmkdir usr/include
- vmkdir usr/lib/pkgconfig
- vmkdir usr/share/avahi/interfaces
-
- for f in bvnc bssh bshell avahi-bookmarks $(vopt_if gir avahi-discover) $(vopt_if gir avahi-discover-standalone); do
- mv ${wrksrc}/tmpinstall/usr/bin/${f} ${DESTDIR}/usr/bin
- if [ -f ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ]; then
- mv ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ${DESTDIR}/usr/share/man/man1
- fi
- if [ -f ${wrksrc}/tmpinstall/usr/share/applications/${f}.desktop ]; then
- mv ${wrksrc}/tmpinstall/usr/share/applications/${f}.desktop ${DESTDIR}/usr/share/applications
- fi
- done
- mv ${wrksrc}/tmpinstall/usr/include/avahi-g* ${DESTDIR}/usr/include
- mv ${wrksrc}/tmpinstall/usr/include/avahi-ui* ${DESTDIR}/usr/include
- mv ${wrksrc}/tmpinstall/usr/lib/python2.7 ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/*avahi-g* ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/*avahi-ui* ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-g* ${DESTDIR}/usr/lib/pkgconfig
- mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-ui* ${DESTDIR}/usr/lib/pkgconfig
- mv ${wrksrc}/tmpinstall/usr/share/avahi/interfaces/*.ui ${DESTDIR}/usr/share/avahi/interfaces
- if [ "$build_option_gir" ]; then
- mv ${wrksrc}/tmpinstall/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/share/gir-1.0 ${DESTDIR}/usr/share
- fi
-}
-
-avahi-python-utils_package() {
- depends="avahi-python>=$version"
- short_desc="Avahi python utilities"
- archs=noarch
- pkg_install() {
- vmove usr/bin/avahi-bookmarks
- vmove "usr/share/man/man1/avahi-bookmarks*"
- }
-}
-
-avahi-python_package() {
- depends="python-dbus"
- short_desc="Python utility package for Avahi"
- archs=noarch
- pycompile_module="avahi"
- pkg_install() {
- vmove usr/lib/python2.7/site-packages/avahi
- }
-}
-
-avahi-glib-libs-devel_package() {
- depends="avahi-libs-devel>=${version}_${revision} avahi-glib-libs>=${version}_${revision}"
- short_desc="Avahi glib libraries - development files"
- pkg_install() {
- vmove "usr/include/avahi-g*"
- vmove "usr/lib/pkgconfig/avahi-g*"
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- vmove usr/lib/libavahi-glib.so
- vmove usr/lib/libavahi-gobject.so
- }
-}
-
-avahi-glib-libs_package() {
- short_desc="Avahi glib shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-glib.so.*"
- vmove "usr/lib/libavahi-gobject.so.*"
- if [ "$build_option_gir" ]; then
- vmove usr/lib/girepository-1.0
- fi
- }
-}
-
-avahi-ui-libs-devel_package() {
- depends="gtk+-devel gtk+3-devel avahi-libs-devel>=${version}_${revision}
- avahi-ui-libs>=${version}_${revision} avahi-ui-libs-gtk3>=${version}_${revision}"
- short_desc="Avahi UI libraries - development files"
- pkg_install() {
- vmove usr/include/avahi-ui/avahi-ui.h
- vmove usr/lib/pkgconfig/avahi-ui.pc
- vmove usr/lib/pkgconfig/avahi-ui-gtk3.pc
- vmove usr/lib/libavahi-ui-gtk3.so
- vmove usr/lib/libavahi-ui.so
- }
-}
-
-avahi-ui-libs-gtk3_package() {
- short_desc="Avahi UI GTK+3 shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-ui-gtk3.so.*"
- }
-}
-
-avahi-ui-libs_package() {
- short_desc="Avahi UI shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-ui.so.*"
- }
-}
-
-avahi-ui-utils_package() {
- depends="desktop-file-utils avahi>=$version"
- short_desc="Avahi GTK+ utilities"
- pkg_install() {
- vmove usr/share/applications/bvnc.desktop
- vmove usr/share/applications/bssh.desktop
- vmove usr/share/man/man1/bssh.1
- if [ "$build_option_gir" ]; then
- vmove usr/bin/avahi-discover-standalone
- fi
- vmove usr/bin/bssh
- vmove usr/share/man/man1/bvnc.1
- vmove usr/bin/bvnc
- vmove usr/bin/bshell
- }
-}
diff --git a/srcpkgs/avahi-discover/update b/srcpkgs/avahi-discover/update
deleted file mode 100644
index b8bee1a9ab5..00000000000
--- a/srcpkgs/avahi-discover/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="avahi"
diff --git a/srcpkgs/avahi-glib-libs b/srcpkgs/avahi-glib-libs
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-glib-libs
+++ b/srcpkgs/avahi-glib-libs
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-glib-libs-devel b/srcpkgs/avahi-glib-libs-devel
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-glib-libs-devel
+++ b/srcpkgs/avahi-glib-libs-devel
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-libevent-libs b/srcpkgs/avahi-libevent-libs
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-libevent-libs
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-libevent-libs-devel b/srcpkgs/avahi-libevent-libs-devel
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-libevent-libs-devel
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python b/srcpkgs/avahi-python
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-python
+++ b/srcpkgs/avahi-python
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python-utils b/srcpkgs/avahi-python-utils
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-python-utils
+++ b/srcpkgs/avahi-python-utils
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python3 b/srcpkgs/avahi-python3
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-python3
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python3-utils b/srcpkgs/avahi-python3-utils
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-python3-utils
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs b/srcpkgs/avahi-qt5-libs
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-qt5-libs
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs-devel b/srcpkgs/avahi-qt5-libs-devel
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-qt5-libs-devel
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs b/srcpkgs/avahi-ui-libs
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs
+++ b/srcpkgs/avahi-ui-libs
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs-devel b/srcpkgs/avahi-ui-libs-devel
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs-devel
+++ b/srcpkgs/avahi-ui-libs-devel
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs-gtk3 b/srcpkgs/avahi-ui-libs-gtk3
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs-gtk3
+++ b/srcpkgs/avahi-ui-libs-gtk3
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-utils b/srcpkgs/avahi-ui-utils
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-utils
+++ b/srcpkgs/avahi-ui-utils
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 199cbd4e057..59337be0c40 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,26 +1,38 @@
# Template file for 'avahi'
pkgname=avahi
-version=0.7
-revision=9
+version=0.8
+revision=1
build_style=gnu-configure
+build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
- --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
- --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
- --with-avahi-priv-access-group=network --with-autoipd-user=avahi
- --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
- --disable-static ssp_cv_lib=no --enable-python
- --disable-glib --disable-python-dbus --disable-gobject --disable-gtk
- --disable-gtk3 --disable-dbm --disable-introspection --sbindir=/usr/bin
- --disable-pygobject"
+ --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
+ --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
+ --with-avahi-priv-access-group=network --with-autoipd-user=avahi
+ --with-autoipd-group=avahi --with-distro=none --enable-xmltoman
+ --disable-static ssp_cv_lib=no --disable-dbm --enable-python
+ --enable-glib --enable-gobject --enable-qt5 --enable-gtk --enable-gtk3
+ --sbindir=/usr/bin --without-systemdsystemunitdir
+ --with-dbus-system-address=unix:path=/run/dbus/system_bus_socket
+ $(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
short_desc="Multicast DNS Service Discovery"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/lathiat/avahi"
-distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
-checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
+### NOTE: The Avahi 0.8 release tarball is broken; it is missing the build-db
+### script. Fetching and manipulation of this file in post_extract should be
+### undone in a future release that fixes this oversight.
+distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz
+ https://raw.githubusercontent.com/lathiat/${pkgname}/v${version}/service-type-database/build-db>build-db.txt"
+checksum="060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
+ 83edd888ccc464ab032134a45b7ded3bc43cb1dda2cd921ff47b01949d98ed7c"
+skip_extraction="build-db.txt"
-hostmakedepends="pkg-config intltool python"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
+hostmakedepends="pkg-config intltool xmltoman glib-devel automake
+ libtool gettext-devel python3 python3-dbus qt5-host-tools
+ $(vopt_if gir gobject-introspection)"
+makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
+ libevent-devel glib-devel python3-dbus gtk+-devel
+ gtk+3-devel qt5-devel $(vopt_if gir python-gobject-devel)"
conf_files="
/etc/avahi/services/ssh.service
/etc/avahi/services/sftp-ssh.service
@@ -29,22 +41,27 @@ conf_files="
/etc/avahi/avahi-dnsconfd.action"
system_accounts="avahi:23"
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" automake libtool glib-devel"
- pre_configure() {
- autoreconf -if
- }
-fi
+build_options="gir"
+build_options_default="gir"
post_extract() {
- # Switch to /run to not depend on /var/run being a symlink.
- sed -e 's,\(avahi_runtime_dir=\).*,\1\"/run\",' -i ${wrksrc}/configure
+ # Avahi 0.8 release mistaken left build-db out of release tarball
+ cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/build-db.txt service-type-database/build-db
+}
+
+pre_configure() {
+ # Without reconfiguration, gtk3 deps are not fully recognized
+ autoreconf -if
}
+
post_install() {
- rm -rf ${DESTDIR}/usr/lib/python*
# Set 'enable-dbus=warn' option by default to not require dbus.
sed -e 's,\#\(enable-dbus\).*,\1=warn,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf
vsv avahi-daemon
+
+ # Python files are compatible with both 2.7 and 3.x, make both subpackages
+ vmkdir ${py2_lib}
+ vcopy ${DESTDIR}/${py3_sitelib} ${py2_lib}
}
avahi-autoipd_package() {
@@ -56,6 +73,7 @@ avahi-autoipd_package() {
vmove etc/avahi/avahi-autoipd.action
}
}
+
avahi-compat-libs-devel_package() {
depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}"
short_desc="Avahi compat libraries - development files"
@@ -66,6 +84,7 @@ avahi-compat-libs-devel_package() {
vmove usr/lib/libdns_sd.so
}
}
+
avahi-compat-libs_package() {
short_desc="Avahi compatiblity shared libraries"
pkg_install() {
@@ -73,6 +92,7 @@ avahi-compat-libs_package() {
vmove "usr/lib/libdns_sd.so.*"
}
}
+
avahi-libs-devel_package() {
depends="dbus-devel avahi-libs-${version}_${revision}"
short_desc="Avahi core libraries - development files"
@@ -87,6 +107,7 @@ avahi-libs-devel_package() {
vmove usr/lib/libavahi-common.so
}
}
+
avahi-libs_package() {
short_desc="Avahi shared libraries"
pkg_install() {
@@ -95,6 +116,7 @@ avahi-libs_package() {
vmove "usr/lib/libavahi-common.so.*"
}
}
+
avahi-utils_package() {
short_desc="Avahi browsing, publishing and discovery utilities"
pkg_install() {
@@ -104,3 +126,157 @@ avahi-utils_package() {
vmove usr/share/man/man1
}
}
+
+avahi-libevent-libs_package() {
+ short_desc="Avahi libevent integration libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-libevent.so.*"
+ }
+}
+
+avahi-libevent-libs-devel_package() {
+ depends="avahi-libs-devel-${version}_${revision} avahi-libevent-libs-${version}_${revision}"
+ short_desc="Avahi libevent integration libraries - development files"
+ pkg_install() {
+ vmove usr/lib/libavahi-libevent.so
+ vmove "usr/include/avahi-libevent*"
+ vmove "usr/lib/pkgconfig/avahi-libevent*"
+ }
+}
+
+avahi-discover_package() {
+ short_desc="Avahi service-discovery user interface"
+ depends="avahi>=${version}_${revision} avahi-python3>=${version}_${revision}
+ $(vopt_if gir 'gtk+3 python3-gobject')"
+ python_version=3
+ pkg_install() {
+ if [ "$build_option_gir" ]; then
+ vmove usr/bin/avahi-discover
+ vmove usr/share/applications/avahi-discover.desktop
+ fi
+ vmove usr/share/avahi/interfaces/avahi-discover.ui
+ vmove usr/share/man/man1/avahi-discover.1
+ }
+}
+
+avahi-python-utils_package() {
+ build_style=meta
+ archs=noarch
+ short_desc+="Avahi python utilities - transitional dummy pkg"
+ depends="avahi-python3-utils-${version}_${revision}"
+}
+
+avahi-python3-utils_package() {
+ depends="avahi-python3>=${version}_${revision}"
+ short_desc="Avahi python utilities"
+ archs=noarch
+ python_version=3
+ pkg_install() {
+ vmove usr/bin/avahi-bookmarks
+ vmove usr/share/man/man1/avahi-bookmarks.1
+ }
+}
+
+avahi-python_package() {
+ depends="python-dbus"
+ short_desc="Python utility package for Avahi"
+ archs=noarch
+ pkg_install() {
+ vmove ${py2_sitelib}/avahi
+ }
+}
+
+avahi-python3_package() {
+ depends="python3-dbus"
+ short_desc="Python3 utility package for Avahi"
+ archs=noarch
+ pkg_install() {
+ vmove ${py3_sitelib}/avahi
+ }
+}
+
+avahi-glib-libs-devel_package() {
+ depends="avahi-libs-devel>=${version}_${revision} avahi-glib-libs>=${version}_${revision}"
+ short_desc="Avahi glib libraries - development files"
+ pkg_install() {
+ vmove "usr/include/avahi-g*"
+ vmove "usr/lib/pkgconfig/avahi-g*"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ vmove usr/lib/libavahi-glib.so
+ vmove usr/lib/libavahi-gobject.so
+ }
+}
+
+avahi-glib-libs_package() {
+ short_desc="Avahi glib shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-glib.so.*"
+ vmove "usr/lib/libavahi-gobject.so.*"
+ if [ "$build_option_gir" ]; then
+ vmove usr/lib/girepository-1.0
+ fi
+ }
+}
+
+avahi-ui-libs-devel_package() {
+ depends="gtk+-devel gtk+3-devel avahi-libs-devel>=${version}_${revision}
+ avahi-ui-libs>=${version}_${revision} avahi-ui-libs-gtk3>=${version}_${revision}"
+ short_desc="Avahi UI libraries - development files"
+ pkg_install() {
+ vmove usr/include/avahi-ui/avahi-ui.h
+ vmove usr/lib/pkgconfig/avahi-ui.pc
+ vmove usr/lib/pkgconfig/avahi-ui-gtk3.pc
+ vmove usr/lib/libavahi-ui-gtk3.so
+ vmove usr/lib/libavahi-ui.so
+ }
+}
+
+avahi-qt5-libs_package() {
+ short_desc="Avahi Qt5 shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-qt5.so.*"
+ }
+}
+
+avahi-qt5-libs-devel_package() {
+ depends="qt5-devel avahi-libs-devel>=${version}_${revision} avahi-qt5-libs>=${version}_${revision}"
+ short_desc="Avahi QT5 shared libraries - development files"
+ pkg_install() {
+ vmove usr/lib/pkgconfig/avahi-qt5.pc
+ vmove usr/lib/libavahi-qt5.so
+ vmove usr/include/avahi-qt5
+ }
+}
+
+avahi-ui-libs-gtk3_package() {
+ short_desc="Avahi UI GTK+3 shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-ui-gtk3.so.*"
+ }
+}
+
+avahi-ui-libs_package() {
+ short_desc="Avahi UI shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-ui.so.*"
+ }
+}
+
+avahi-ui-utils_package() {
+ depends="desktop-file-utils avahi>=$version"
+ short_desc="Avahi GTK+ utilities"
+ pkg_install() {
+ vmove usr/share/applications/bvnc.desktop
+ vmove usr/share/applications/bssh.desktop
+ vmove usr/share/man/man1/bssh.1
+ if [ "$build_option_gir" ]; then
+ vmove usr/bin/avahi-discover-standalone
+ fi
+ vmove usr/bin/bssh
+ vmove usr/share/man/man1/bvnc.1
+ vmove usr/bin/bvnc
+ vmove usr/bin/bshell
+ }
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Update avahi, take ownership
2020-05-07 20:53 [PR PATCH] Update avahi, take ownership ahesford
2020-05-09 16:35 ` [PR PATCH] [Updated] " ahesford
2020-05-09 16:40 ` ahesford
@ 2020-05-09 21:14 ` ahesford
2020-05-11 18:19 ` ahesford
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ahesford @ 2020-05-09 21:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages avahi
https://github.com/void-linux/void-packages/pull/21731
Update avahi, take ownership
This brings avahi and its subpackages up to date. Included are new libraries to incorporate avahi with libevent or qt5, as new subpackages. Also, the Python parts of avahi are compatible with py3, so there are new `-python3` subpackages as appropriate. The `avahi-python` package is still usable with py2 and has been preserved; `avahi-python-utils` is now an empty meta to bring in the new `avahi-python3-utils`, as the contents of the newer package supplant the older.
EDIT: I've also unified the `avahi-discover` and `avahi` templates. They were separate to avoid dependencies like `gtk+3` in the base packages. However, I've double-checked the dependencies when building all of the subpackages from one template, and these extra dependencies do not leak into the base package. The unification makes maintenance easier and saves build time, because now `avahi-discover` and its subpackages can just copy files from the `avahi` build rather than rebuilding everything (with the potential for mismatched build options) a second time just to extract the UI bits.
A patch file from https://github.com/void-linux/void-packages/pull/21731.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-avahi-21731.patch --]
[-- Type: text/x-diff, Size: 21163 bytes --]
From 03a619b3db72c22da0b833b2ca26d63cbfc8481c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 7 May 2020 14:47:34 -0400
Subject: [PATCH] avahi: update to 0.8, unify with avahi-discover
---
common/shlibs | 2 +
srcpkgs/avahi-discover | 1 +
srcpkgs/avahi-discover/template | 169 ----------------------
srcpkgs/avahi-discover/update | 1 -
srcpkgs/avahi-glib-libs | 2 +-
srcpkgs/avahi-glib-libs-devel | 2 +-
srcpkgs/avahi-libevent-libs | 1 +
srcpkgs/avahi-libevent-libs-devel | 1 +
srcpkgs/avahi-python | 2 +-
srcpkgs/avahi-python-utils | 2 +-
srcpkgs/avahi-python3 | 1 +
srcpkgs/avahi-python3-utils | 1 +
srcpkgs/avahi-qt5-libs | 1 +
srcpkgs/avahi-qt5-libs-devel | 1 +
srcpkgs/avahi-ui-libs | 2 +-
srcpkgs/avahi-ui-libs-devel | 2 +-
srcpkgs/avahi-ui-libs-gtk3 | 2 +-
srcpkgs/avahi-ui-utils | 2 +-
srcpkgs/avahi/template | 225 ++++++++++++++++++++++++++----
19 files changed, 218 insertions(+), 202 deletions(-)
create mode 120000 srcpkgs/avahi-discover
delete mode 100644 srcpkgs/avahi-discover/template
delete mode 100644 srcpkgs/avahi-discover/update
create mode 120000 srcpkgs/avahi-libevent-libs
create mode 120000 srcpkgs/avahi-libevent-libs-devel
create mode 120000 srcpkgs/avahi-python3
create mode 120000 srcpkgs/avahi-python3-utils
create mode 120000 srcpkgs/avahi-qt5-libs
create mode 120000 srcpkgs/avahi-qt5-libs-devel
diff --git a/common/shlibs b/common/shlibs
index 8342e117092..c9a76f6cc5d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -389,6 +389,8 @@ libdns_sd.so.1 avahi-compat-libs-0.6.25_1
libhowl.so.0 avahi-compat-libs-0.6.25_1
libavahi-ui.so.0 avahi-ui-libs-0.6.25_1
libavahi-ui-gtk3.so.0 avahi-ui-libs-gtk3-0.6.25_1
+libavahi-libevent.so.1 avahi-libevent-libs-0.8_1
+libavahi-qt5.so.1 avahi-qt5-libs-0.8_1
libmp4v2.so.2 libmp4v2-2.0.0_1
libfaac.so.0 faac-1.28_1
libfaad.so.2 faad2-2.7_1
diff --git a/srcpkgs/avahi-discover b/srcpkgs/avahi-discover
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-discover
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
deleted file mode 100644
index 4387c1d584c..00000000000
--- a/srcpkgs/avahi-discover/template
+++ /dev/null
@@ -1,169 +0,0 @@
-# Template file for 'avahi-discover'
-#
-# WARNING: THIS TEMPLATE MUST BE SYNCHRONIZED WITH AVAHI. IT IS SPLITTED TO DROP
-# ADDITIONAL DEPENDENCIES LIKE GTK3 AND PyGI.
-#
-pkgname=avahi-discover
-version=0.7
-revision=8
-wrksrc="avahi-${version}"
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
- --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
- --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
- --with-avahi-priv-access-group=network --with-autoipd-user=avahi
- --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
- --disable-dbm --without-systemdsystemunitdir
- --disable-static ssp_cv_lib=no --enable-python
- --enable-glib --enable-gobject --enable-gtk --enable-gtk3
- $(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
-short_desc="Service discover user interface for avahi"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/lathiat/avahi"
-distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
-checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
-
-hostmakedepends="automake libtool pkg-config intltool
- python-dbus gobject-introspection glib-devel"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
- python-dbus gtk+-devel gtk+3-devel $(vopt_if gir python-gobject-devel)"
-depends="avahi>=${version} avahi-python>=${version}
- $(vopt_if gir 'gtk+3 python-gobject') desktop-file-utils"
-pycompile_module="avahi_discover"
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_configure() {
- autoreconf -fi
- sed -e 's,-Werror,,g' -i configure
-}
-
-do_install() {
- mkdir -p ${wrksrc}/tmpinstall/usr/lib
- ln -s lib ${wrksrc}/tmpinstall/usr/lib32
-
- make DESTDIR=${wrksrc}/tmpinstall install
-
- # Move all required files to ${DESTDIR} now...
- vmkdir usr/bin
- vmkdir usr/share/man/man1
- vmkdir usr/share/applications
- vmkdir usr/include
- vmkdir usr/lib/pkgconfig
- vmkdir usr/share/avahi/interfaces
-
- for f in bvnc bssh bshell avahi-bookmarks $(vopt_if gir avahi-discover) $(vopt_if gir avahi-discover-standalone); do
- mv ${wrksrc}/tmpinstall/usr/bin/${f} ${DESTDIR}/usr/bin
- if [ -f ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ]; then
- mv ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ${DESTDIR}/usr/share/man/man1
- fi
- if [ -f ${wrksrc}/tmpinstall/usr/share/applications/${f}.desktop ]; then
- mv ${wrksrc}/tmpinstall/usr/share/applications/${f}.desktop ${DESTDIR}/usr/share/applications
- fi
- done
- mv ${wrksrc}/tmpinstall/usr/include/avahi-g* ${DESTDIR}/usr/include
- mv ${wrksrc}/tmpinstall/usr/include/avahi-ui* ${DESTDIR}/usr/include
- mv ${wrksrc}/tmpinstall/usr/lib/python2.7 ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/*avahi-g* ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/*avahi-ui* ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-g* ${DESTDIR}/usr/lib/pkgconfig
- mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-ui* ${DESTDIR}/usr/lib/pkgconfig
- mv ${wrksrc}/tmpinstall/usr/share/avahi/interfaces/*.ui ${DESTDIR}/usr/share/avahi/interfaces
- if [ "$build_option_gir" ]; then
- mv ${wrksrc}/tmpinstall/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/share/gir-1.0 ${DESTDIR}/usr/share
- fi
-}
-
-avahi-python-utils_package() {
- depends="avahi-python>=$version"
- short_desc="Avahi python utilities"
- archs=noarch
- pkg_install() {
- vmove usr/bin/avahi-bookmarks
- vmove "usr/share/man/man1/avahi-bookmarks*"
- }
-}
-
-avahi-python_package() {
- depends="python-dbus"
- short_desc="Python utility package for Avahi"
- archs=noarch
- pycompile_module="avahi"
- pkg_install() {
- vmove usr/lib/python2.7/site-packages/avahi
- }
-}
-
-avahi-glib-libs-devel_package() {
- depends="avahi-libs-devel>=${version}_${revision} avahi-glib-libs>=${version}_${revision}"
- short_desc="Avahi glib libraries - development files"
- pkg_install() {
- vmove "usr/include/avahi-g*"
- vmove "usr/lib/pkgconfig/avahi-g*"
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- vmove usr/lib/libavahi-glib.so
- vmove usr/lib/libavahi-gobject.so
- }
-}
-
-avahi-glib-libs_package() {
- short_desc="Avahi glib shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-glib.so.*"
- vmove "usr/lib/libavahi-gobject.so.*"
- if [ "$build_option_gir" ]; then
- vmove usr/lib/girepository-1.0
- fi
- }
-}
-
-avahi-ui-libs-devel_package() {
- depends="gtk+-devel gtk+3-devel avahi-libs-devel>=${version}_${revision}
- avahi-ui-libs>=${version}_${revision} avahi-ui-libs-gtk3>=${version}_${revision}"
- short_desc="Avahi UI libraries - development files"
- pkg_install() {
- vmove usr/include/avahi-ui/avahi-ui.h
- vmove usr/lib/pkgconfig/avahi-ui.pc
- vmove usr/lib/pkgconfig/avahi-ui-gtk3.pc
- vmove usr/lib/libavahi-ui-gtk3.so
- vmove usr/lib/libavahi-ui.so
- }
-}
-
-avahi-ui-libs-gtk3_package() {
- short_desc="Avahi UI GTK+3 shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-ui-gtk3.so.*"
- }
-}
-
-avahi-ui-libs_package() {
- short_desc="Avahi UI shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-ui.so.*"
- }
-}
-
-avahi-ui-utils_package() {
- depends="desktop-file-utils avahi>=$version"
- short_desc="Avahi GTK+ utilities"
- pkg_install() {
- vmove usr/share/applications/bvnc.desktop
- vmove usr/share/applications/bssh.desktop
- vmove usr/share/man/man1/bssh.1
- if [ "$build_option_gir" ]; then
- vmove usr/bin/avahi-discover-standalone
- fi
- vmove usr/bin/bssh
- vmove usr/share/man/man1/bvnc.1
- vmove usr/bin/bvnc
- vmove usr/bin/bshell
- }
-}
diff --git a/srcpkgs/avahi-discover/update b/srcpkgs/avahi-discover/update
deleted file mode 100644
index b8bee1a9ab5..00000000000
--- a/srcpkgs/avahi-discover/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="avahi"
diff --git a/srcpkgs/avahi-glib-libs b/srcpkgs/avahi-glib-libs
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-glib-libs
+++ b/srcpkgs/avahi-glib-libs
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-glib-libs-devel b/srcpkgs/avahi-glib-libs-devel
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-glib-libs-devel
+++ b/srcpkgs/avahi-glib-libs-devel
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-libevent-libs b/srcpkgs/avahi-libevent-libs
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-libevent-libs
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-libevent-libs-devel b/srcpkgs/avahi-libevent-libs-devel
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-libevent-libs-devel
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python b/srcpkgs/avahi-python
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-python
+++ b/srcpkgs/avahi-python
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python-utils b/srcpkgs/avahi-python-utils
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-python-utils
+++ b/srcpkgs/avahi-python-utils
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python3 b/srcpkgs/avahi-python3
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-python3
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python3-utils b/srcpkgs/avahi-python3-utils
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-python3-utils
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs b/srcpkgs/avahi-qt5-libs
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-qt5-libs
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs-devel b/srcpkgs/avahi-qt5-libs-devel
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-qt5-libs-devel
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs b/srcpkgs/avahi-ui-libs
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs
+++ b/srcpkgs/avahi-ui-libs
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs-devel b/srcpkgs/avahi-ui-libs-devel
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs-devel
+++ b/srcpkgs/avahi-ui-libs-devel
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs-gtk3 b/srcpkgs/avahi-ui-libs-gtk3
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs-gtk3
+++ b/srcpkgs/avahi-ui-libs-gtk3
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-utils b/srcpkgs/avahi-ui-utils
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-utils
+++ b/srcpkgs/avahi-ui-utils
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 199cbd4e057..26f5b0e6ec9 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,26 +1,38 @@
# Template file for 'avahi'
pkgname=avahi
-version=0.7
-revision=9
+version=0.8
+revision=1
build_style=gnu-configure
+build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
- --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
- --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
- --with-avahi-priv-access-group=network --with-autoipd-user=avahi
- --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
- --disable-static ssp_cv_lib=no --enable-python
- --disable-glib --disable-python-dbus --disable-gobject --disable-gtk
- --disable-gtk3 --disable-dbm --disable-introspection --sbindir=/usr/bin
- --disable-pygobject"
+ --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
+ --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
+ --with-avahi-priv-access-group=network --with-autoipd-user=avahi
+ --with-autoipd-group=avahi --with-distro=none --enable-xmltoman
+ --disable-static ssp_cv_lib=no --disable-dbm --enable-python
+ --enable-glib --enable-gobject --enable-qt5 --enable-gtk --enable-gtk3
+ --sbindir=/usr/bin --without-systemdsystemunitdir
+ --with-dbus-system-address=unix:path=/run/dbus/system_bus_socket
+ $(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
short_desc="Multicast DNS Service Discovery"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/lathiat/avahi"
-distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
-checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
+### NOTE: The Avahi 0.8 release tarball is broken; it is missing the build-db
+### script. Fetching and manipulation of this file in post_extract should be
+### undone in a future release that fixes this oversight.
+distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz
+ https://raw.githubusercontent.com/lathiat/${pkgname}/v${version}/service-type-database/build-db>build-db.txt"
+checksum="060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
+ 83edd888ccc464ab032134a45b7ded3bc43cb1dda2cd921ff47b01949d98ed7c"
+skip_extraction="build-db.txt"
-hostmakedepends="pkg-config intltool python"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
+hostmakedepends="pkg-config intltool xmltoman glib-devel automake
+ libtool gettext-devel python3 python3-dbus qt5-host-tools
+ $(vopt_if gir gobject-introspection)"
+makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
+ libevent-devel glib-devel python3-dbus gtk+-devel
+ gtk+3-devel qt5-devel $(vopt_if gir python-gobject-devel)"
conf_files="
/etc/avahi/services/ssh.service
/etc/avahi/services/sftp-ssh.service
@@ -29,22 +41,28 @@ conf_files="
/etc/avahi/avahi-dnsconfd.action"
system_accounts="avahi:23"
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" automake libtool glib-devel"
- pre_configure() {
- autoreconf -if
- }
-fi
+build_options="gir"
+build_options_default="gir"
post_extract() {
- # Switch to /run to not depend on /var/run being a symlink.
- sed -e 's,\(avahi_runtime_dir=\).*,\1\"/run\",' -i ${wrksrc}/configure
+ # Avahi 0.8 release mistaken left build-db out of release tarball
+ cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/build-db.txt service-type-database/build-db
+}
+
+pre_configure() {
+ # Without reconfiguration, gtk3 deps are not fully recognized
+ autoreconf -if
+ sed -e 's,-Werror,,g' -i configure
}
+
post_install() {
- rm -rf ${DESTDIR}/usr/lib/python*
# Set 'enable-dbus=warn' option by default to not require dbus.
sed -e 's,\#\(enable-dbus\).*,\1=warn,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf
vsv avahi-daemon
+
+ # Python files are compatible with both 2.7 and 3.x, make both subpackages
+ vmkdir ${py2_lib}
+ vcopy ${DESTDIR}/${py3_sitelib} ${py2_lib}
}
avahi-autoipd_package() {
@@ -56,6 +74,7 @@ avahi-autoipd_package() {
vmove etc/avahi/avahi-autoipd.action
}
}
+
avahi-compat-libs-devel_package() {
depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}"
short_desc="Avahi compat libraries - development files"
@@ -66,6 +85,7 @@ avahi-compat-libs-devel_package() {
vmove usr/lib/libdns_sd.so
}
}
+
avahi-compat-libs_package() {
short_desc="Avahi compatiblity shared libraries"
pkg_install() {
@@ -73,6 +93,7 @@ avahi-compat-libs_package() {
vmove "usr/lib/libdns_sd.so.*"
}
}
+
avahi-libs-devel_package() {
depends="dbus-devel avahi-libs-${version}_${revision}"
short_desc="Avahi core libraries - development files"
@@ -87,6 +108,7 @@ avahi-libs-devel_package() {
vmove usr/lib/libavahi-common.so
}
}
+
avahi-libs_package() {
short_desc="Avahi shared libraries"
pkg_install() {
@@ -95,6 +117,7 @@ avahi-libs_package() {
vmove "usr/lib/libavahi-common.so.*"
}
}
+
avahi-utils_package() {
short_desc="Avahi browsing, publishing and discovery utilities"
pkg_install() {
@@ -104,3 +127,157 @@ avahi-utils_package() {
vmove usr/share/man/man1
}
}
+
+avahi-libevent-libs_package() {
+ short_desc="Avahi libevent integration libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-libevent.so.*"
+ }
+}
+
+avahi-libevent-libs-devel_package() {
+ depends="avahi-libs-devel-${version}_${revision} avahi-libevent-libs-${version}_${revision}"
+ short_desc="Avahi libevent integration libraries - development files"
+ pkg_install() {
+ vmove usr/lib/libavahi-libevent.so
+ vmove "usr/include/avahi-libevent*"
+ vmove "usr/lib/pkgconfig/avahi-libevent*"
+ }
+}
+
+avahi-discover_package() {
+ short_desc="Avahi service-discovery user interface"
+ depends="avahi>=${version}_${revision} avahi-python3>=${version}_${revision}
+ $(vopt_if gir 'gtk+3 python3-gobject')"
+ python_version=3
+ pkg_install() {
+ if [ "$build_option_gir" ]; then
+ vmove usr/bin/avahi-discover
+ vmove usr/share/applications/avahi-discover.desktop
+ fi
+ vmove usr/share/avahi/interfaces/avahi-discover.ui
+ vmove usr/share/man/man1/avahi-discover.1
+ }
+}
+
+avahi-python-utils_package() {
+ build_style=meta
+ archs=noarch
+ short_desc+="Avahi python utilities - transitional dummy pkg"
+ depends="avahi-python3-utils-${version}_${revision}"
+}
+
+avahi-python3-utils_package() {
+ depends="avahi-python3>=${version}_${revision}"
+ short_desc="Avahi python utilities"
+ archs=noarch
+ python_version=3
+ pkg_install() {
+ vmove usr/bin/avahi-bookmarks
+ vmove usr/share/man/man1/avahi-bookmarks.1
+ }
+}
+
+avahi-python_package() {
+ depends="python-dbus"
+ short_desc="Python utility package for Avahi"
+ archs=noarch
+ pkg_install() {
+ vmove ${py2_sitelib}/avahi
+ }
+}
+
+avahi-python3_package() {
+ depends="python3-dbus"
+ short_desc="Python3 utility package for Avahi"
+ archs=noarch
+ pkg_install() {
+ vmove ${py3_sitelib}/avahi
+ }
+}
+
+avahi-glib-libs-devel_package() {
+ depends="avahi-libs-devel>=${version}_${revision} avahi-glib-libs>=${version}_${revision}"
+ short_desc="Avahi glib libraries - development files"
+ pkg_install() {
+ vmove "usr/include/avahi-g*"
+ vmove "usr/lib/pkgconfig/avahi-g*"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ vmove usr/lib/libavahi-glib.so
+ vmove usr/lib/libavahi-gobject.so
+ }
+}
+
+avahi-glib-libs_package() {
+ short_desc="Avahi glib shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-glib.so.*"
+ vmove "usr/lib/libavahi-gobject.so.*"
+ if [ "$build_option_gir" ]; then
+ vmove usr/lib/girepository-1.0
+ fi
+ }
+}
+
+avahi-ui-libs-devel_package() {
+ depends="gtk+-devel gtk+3-devel avahi-libs-devel>=${version}_${revision}
+ avahi-ui-libs>=${version}_${revision} avahi-ui-libs-gtk3>=${version}_${revision}"
+ short_desc="Avahi UI libraries - development files"
+ pkg_install() {
+ vmove usr/include/avahi-ui/avahi-ui.h
+ vmove usr/lib/pkgconfig/avahi-ui.pc
+ vmove usr/lib/pkgconfig/avahi-ui-gtk3.pc
+ vmove usr/lib/libavahi-ui-gtk3.so
+ vmove usr/lib/libavahi-ui.so
+ }
+}
+
+avahi-qt5-libs_package() {
+ short_desc="Avahi Qt5 shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-qt5.so.*"
+ }
+}
+
+avahi-qt5-libs-devel_package() {
+ depends="qt5-devel avahi-libs-devel>=${version}_${revision} avahi-qt5-libs>=${version}_${revision}"
+ short_desc="Avahi QT5 shared libraries - development files"
+ pkg_install() {
+ vmove usr/lib/pkgconfig/avahi-qt5.pc
+ vmove usr/lib/libavahi-qt5.so
+ vmove usr/include/avahi-qt5
+ }
+}
+
+avahi-ui-libs-gtk3_package() {
+ short_desc="Avahi UI GTK+3 shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-ui-gtk3.so.*"
+ }
+}
+
+avahi-ui-libs_package() {
+ short_desc="Avahi UI shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-ui.so.*"
+ }
+}
+
+avahi-ui-utils_package() {
+ depends="desktop-file-utils avahi>=$version"
+ short_desc="Avahi GTK+ utilities"
+ pkg_install() {
+ vmove usr/share/applications/bvnc.desktop
+ vmove usr/share/applications/bssh.desktop
+ vmove usr/share/man/man1/bssh.1
+ if [ "$build_option_gir" ]; then
+ vmove usr/bin/avahi-discover-standalone
+ fi
+ vmove usr/bin/bssh
+ vmove usr/share/man/man1/bvnc.1
+ vmove usr/bin/bvnc
+ vmove usr/bin/bshell
+ }
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Update avahi, take ownership
2020-05-07 20:53 [PR PATCH] Update avahi, take ownership ahesford
` (2 preceding siblings ...)
2020-05-09 21:14 ` ahesford
@ 2020-05-11 18:19 ` ahesford
2020-05-14 12:49 ` ahesford
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ahesford @ 2020-05-11 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages avahi
https://github.com/void-linux/void-packages/pull/21731
Update avahi, take ownership
This brings avahi and its subpackages up to date. Included are new libraries to incorporate avahi with libevent or qt5, as new subpackages. Also, the Python parts of avahi are compatible with py3, so there are new `-python3` subpackages as appropriate. The `avahi-python` package is still usable with py2 and has been preserved; `avahi-python-utils` is now an empty meta to bring in the new `avahi-python3-utils`, as the contents of the newer package supplant the older.
EDIT: I've also unified the `avahi-discover` and `avahi` templates. They were separate to avoid dependencies like `gtk+3` in the base packages. However, I've double-checked the dependencies when building all of the subpackages from one template, and these extra dependencies do not leak into the base package. The unification makes maintenance easier and saves build time, because now `avahi-discover` and its subpackages can just copy files from the `avahi` build rather than rebuilding everything (with the potential for mismatched build options) a second time just to extract the UI bits.
A patch file from https://github.com/void-linux/void-packages/pull/21731.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-avahi-21731.patch --]
[-- Type: text/x-diff, Size: 21163 bytes --]
From 722c16229b12d35a52fee195817a4113dc4baa0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 7 May 2020 14:47:34 -0400
Subject: [PATCH] avahi: update to 0.8, unify with avahi-discover
---
common/shlibs | 2 +
srcpkgs/avahi-discover | 1 +
srcpkgs/avahi-discover/template | 169 ----------------------
srcpkgs/avahi-discover/update | 1 -
srcpkgs/avahi-glib-libs | 2 +-
srcpkgs/avahi-glib-libs-devel | 2 +-
srcpkgs/avahi-libevent-libs | 1 +
srcpkgs/avahi-libevent-libs-devel | 1 +
srcpkgs/avahi-python | 2 +-
srcpkgs/avahi-python-utils | 2 +-
srcpkgs/avahi-python3 | 1 +
srcpkgs/avahi-python3-utils | 1 +
srcpkgs/avahi-qt5-libs | 1 +
srcpkgs/avahi-qt5-libs-devel | 1 +
srcpkgs/avahi-ui-libs | 2 +-
srcpkgs/avahi-ui-libs-devel | 2 +-
srcpkgs/avahi-ui-libs-gtk3 | 2 +-
srcpkgs/avahi-ui-utils | 2 +-
srcpkgs/avahi/template | 225 ++++++++++++++++++++++++++----
19 files changed, 218 insertions(+), 202 deletions(-)
create mode 120000 srcpkgs/avahi-discover
delete mode 100644 srcpkgs/avahi-discover/template
delete mode 100644 srcpkgs/avahi-discover/update
create mode 120000 srcpkgs/avahi-libevent-libs
create mode 120000 srcpkgs/avahi-libevent-libs-devel
create mode 120000 srcpkgs/avahi-python3
create mode 120000 srcpkgs/avahi-python3-utils
create mode 120000 srcpkgs/avahi-qt5-libs
create mode 120000 srcpkgs/avahi-qt5-libs-devel
diff --git a/common/shlibs b/common/shlibs
index 8342e117092..c9a76f6cc5d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -389,6 +389,8 @@ libdns_sd.so.1 avahi-compat-libs-0.6.25_1
libhowl.so.0 avahi-compat-libs-0.6.25_1
libavahi-ui.so.0 avahi-ui-libs-0.6.25_1
libavahi-ui-gtk3.so.0 avahi-ui-libs-gtk3-0.6.25_1
+libavahi-libevent.so.1 avahi-libevent-libs-0.8_1
+libavahi-qt5.so.1 avahi-qt5-libs-0.8_1
libmp4v2.so.2 libmp4v2-2.0.0_1
libfaac.so.0 faac-1.28_1
libfaad.so.2 faad2-2.7_1
diff --git a/srcpkgs/avahi-discover b/srcpkgs/avahi-discover
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-discover
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
deleted file mode 100644
index 4387c1d584c..00000000000
--- a/srcpkgs/avahi-discover/template
+++ /dev/null
@@ -1,169 +0,0 @@
-# Template file for 'avahi-discover'
-#
-# WARNING: THIS TEMPLATE MUST BE SYNCHRONIZED WITH AVAHI. IT IS SPLITTED TO DROP
-# ADDITIONAL DEPENDENCIES LIKE GTK3 AND PyGI.
-#
-pkgname=avahi-discover
-version=0.7
-revision=8
-wrksrc="avahi-${version}"
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
- --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
- --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
- --with-avahi-priv-access-group=network --with-autoipd-user=avahi
- --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
- --disable-dbm --without-systemdsystemunitdir
- --disable-static ssp_cv_lib=no --enable-python
- --enable-glib --enable-gobject --enable-gtk --enable-gtk3
- $(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
-short_desc="Service discover user interface for avahi"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/lathiat/avahi"
-distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
-checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
-
-hostmakedepends="automake libtool pkg-config intltool
- python-dbus gobject-introspection glib-devel"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
- python-dbus gtk+-devel gtk+3-devel $(vopt_if gir python-gobject-devel)"
-depends="avahi>=${version} avahi-python>=${version}
- $(vopt_if gir 'gtk+3 python-gobject') desktop-file-utils"
-pycompile_module="avahi_discover"
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_configure() {
- autoreconf -fi
- sed -e 's,-Werror,,g' -i configure
-}
-
-do_install() {
- mkdir -p ${wrksrc}/tmpinstall/usr/lib
- ln -s lib ${wrksrc}/tmpinstall/usr/lib32
-
- make DESTDIR=${wrksrc}/tmpinstall install
-
- # Move all required files to ${DESTDIR} now...
- vmkdir usr/bin
- vmkdir usr/share/man/man1
- vmkdir usr/share/applications
- vmkdir usr/include
- vmkdir usr/lib/pkgconfig
- vmkdir usr/share/avahi/interfaces
-
- for f in bvnc bssh bshell avahi-bookmarks $(vopt_if gir avahi-discover) $(vopt_if gir avahi-discover-standalone); do
- mv ${wrksrc}/tmpinstall/usr/bin/${f} ${DESTDIR}/usr/bin
- if [ -f ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ]; then
- mv ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ${DESTDIR}/usr/share/man/man1
- fi
- if [ -f ${wrksrc}/tmpinstall/usr/share/applications/${f}.desktop ]; then
- mv ${wrksrc}/tmpinstall/usr/share/applications/${f}.desktop ${DESTDIR}/usr/share/applications
- fi
- done
- mv ${wrksrc}/tmpinstall/usr/include/avahi-g* ${DESTDIR}/usr/include
- mv ${wrksrc}/tmpinstall/usr/include/avahi-ui* ${DESTDIR}/usr/include
- mv ${wrksrc}/tmpinstall/usr/lib/python2.7 ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/*avahi-g* ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/*avahi-ui* ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-g* ${DESTDIR}/usr/lib/pkgconfig
- mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-ui* ${DESTDIR}/usr/lib/pkgconfig
- mv ${wrksrc}/tmpinstall/usr/share/avahi/interfaces/*.ui ${DESTDIR}/usr/share/avahi/interfaces
- if [ "$build_option_gir" ]; then
- mv ${wrksrc}/tmpinstall/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/share/gir-1.0 ${DESTDIR}/usr/share
- fi
-}
-
-avahi-python-utils_package() {
- depends="avahi-python>=$version"
- short_desc="Avahi python utilities"
- archs=noarch
- pkg_install() {
- vmove usr/bin/avahi-bookmarks
- vmove "usr/share/man/man1/avahi-bookmarks*"
- }
-}
-
-avahi-python_package() {
- depends="python-dbus"
- short_desc="Python utility package for Avahi"
- archs=noarch
- pycompile_module="avahi"
- pkg_install() {
- vmove usr/lib/python2.7/site-packages/avahi
- }
-}
-
-avahi-glib-libs-devel_package() {
- depends="avahi-libs-devel>=${version}_${revision} avahi-glib-libs>=${version}_${revision}"
- short_desc="Avahi glib libraries - development files"
- pkg_install() {
- vmove "usr/include/avahi-g*"
- vmove "usr/lib/pkgconfig/avahi-g*"
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- vmove usr/lib/libavahi-glib.so
- vmove usr/lib/libavahi-gobject.so
- }
-}
-
-avahi-glib-libs_package() {
- short_desc="Avahi glib shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-glib.so.*"
- vmove "usr/lib/libavahi-gobject.so.*"
- if [ "$build_option_gir" ]; then
- vmove usr/lib/girepository-1.0
- fi
- }
-}
-
-avahi-ui-libs-devel_package() {
- depends="gtk+-devel gtk+3-devel avahi-libs-devel>=${version}_${revision}
- avahi-ui-libs>=${version}_${revision} avahi-ui-libs-gtk3>=${version}_${revision}"
- short_desc="Avahi UI libraries - development files"
- pkg_install() {
- vmove usr/include/avahi-ui/avahi-ui.h
- vmove usr/lib/pkgconfig/avahi-ui.pc
- vmove usr/lib/pkgconfig/avahi-ui-gtk3.pc
- vmove usr/lib/libavahi-ui-gtk3.so
- vmove usr/lib/libavahi-ui.so
- }
-}
-
-avahi-ui-libs-gtk3_package() {
- short_desc="Avahi UI GTK+3 shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-ui-gtk3.so.*"
- }
-}
-
-avahi-ui-libs_package() {
- short_desc="Avahi UI shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-ui.so.*"
- }
-}
-
-avahi-ui-utils_package() {
- depends="desktop-file-utils avahi>=$version"
- short_desc="Avahi GTK+ utilities"
- pkg_install() {
- vmove usr/share/applications/bvnc.desktop
- vmove usr/share/applications/bssh.desktop
- vmove usr/share/man/man1/bssh.1
- if [ "$build_option_gir" ]; then
- vmove usr/bin/avahi-discover-standalone
- fi
- vmove usr/bin/bssh
- vmove usr/share/man/man1/bvnc.1
- vmove usr/bin/bvnc
- vmove usr/bin/bshell
- }
-}
diff --git a/srcpkgs/avahi-discover/update b/srcpkgs/avahi-discover/update
deleted file mode 100644
index b8bee1a9ab5..00000000000
--- a/srcpkgs/avahi-discover/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="avahi"
diff --git a/srcpkgs/avahi-glib-libs b/srcpkgs/avahi-glib-libs
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-glib-libs
+++ b/srcpkgs/avahi-glib-libs
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-glib-libs-devel b/srcpkgs/avahi-glib-libs-devel
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-glib-libs-devel
+++ b/srcpkgs/avahi-glib-libs-devel
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-libevent-libs b/srcpkgs/avahi-libevent-libs
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-libevent-libs
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-libevent-libs-devel b/srcpkgs/avahi-libevent-libs-devel
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-libevent-libs-devel
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python b/srcpkgs/avahi-python
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-python
+++ b/srcpkgs/avahi-python
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python-utils b/srcpkgs/avahi-python-utils
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-python-utils
+++ b/srcpkgs/avahi-python-utils
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python3 b/srcpkgs/avahi-python3
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-python3
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python3-utils b/srcpkgs/avahi-python3-utils
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-python3-utils
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs b/srcpkgs/avahi-qt5-libs
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-qt5-libs
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs-devel b/srcpkgs/avahi-qt5-libs-devel
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-qt5-libs-devel
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs b/srcpkgs/avahi-ui-libs
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs
+++ b/srcpkgs/avahi-ui-libs
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs-devel b/srcpkgs/avahi-ui-libs-devel
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs-devel
+++ b/srcpkgs/avahi-ui-libs-devel
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs-gtk3 b/srcpkgs/avahi-ui-libs-gtk3
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs-gtk3
+++ b/srcpkgs/avahi-ui-libs-gtk3
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-utils b/srcpkgs/avahi-ui-utils
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-utils
+++ b/srcpkgs/avahi-ui-utils
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 199cbd4e057..26f5b0e6ec9 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,26 +1,38 @@
# Template file for 'avahi'
pkgname=avahi
-version=0.7
-revision=9
+version=0.8
+revision=1
build_style=gnu-configure
+build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
- --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
- --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
- --with-avahi-priv-access-group=network --with-autoipd-user=avahi
- --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
- --disable-static ssp_cv_lib=no --enable-python
- --disable-glib --disable-python-dbus --disable-gobject --disable-gtk
- --disable-gtk3 --disable-dbm --disable-introspection --sbindir=/usr/bin
- --disable-pygobject"
+ --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
+ --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
+ --with-avahi-priv-access-group=network --with-autoipd-user=avahi
+ --with-autoipd-group=avahi --with-distro=none --enable-xmltoman
+ --disable-static ssp_cv_lib=no --disable-dbm --enable-python
+ --enable-glib --enable-gobject --enable-qt5 --enable-gtk --enable-gtk3
+ --sbindir=/usr/bin --without-systemdsystemunitdir
+ --with-dbus-system-address=unix:path=/run/dbus/system_bus_socket
+ $(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
short_desc="Multicast DNS Service Discovery"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/lathiat/avahi"
-distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
-checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
+### NOTE: The Avahi 0.8 release tarball is broken; it is missing the build-db
+### script. Fetching and manipulation of this file in post_extract should be
+### undone in a future release that fixes this oversight.
+distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz
+ https://raw.githubusercontent.com/lathiat/${pkgname}/v${version}/service-type-database/build-db>build-db.txt"
+checksum="060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
+ 83edd888ccc464ab032134a45b7ded3bc43cb1dda2cd921ff47b01949d98ed7c"
+skip_extraction="build-db.txt"
-hostmakedepends="pkg-config intltool python"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
+hostmakedepends="pkg-config intltool xmltoman glib-devel automake
+ libtool gettext-devel python3 python3-dbus qt5-host-tools
+ $(vopt_if gir gobject-introspection)"
+makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
+ libevent-devel glib-devel python3-dbus gtk+-devel
+ gtk+3-devel qt5-devel $(vopt_if gir python-gobject-devel)"
conf_files="
/etc/avahi/services/ssh.service
/etc/avahi/services/sftp-ssh.service
@@ -29,22 +41,28 @@ conf_files="
/etc/avahi/avahi-dnsconfd.action"
system_accounts="avahi:23"
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" automake libtool glib-devel"
- pre_configure() {
- autoreconf -if
- }
-fi
+build_options="gir"
+build_options_default="gir"
post_extract() {
- # Switch to /run to not depend on /var/run being a symlink.
- sed -e 's,\(avahi_runtime_dir=\).*,\1\"/run\",' -i ${wrksrc}/configure
+ # Avahi 0.8 release mistaken left build-db out of release tarball
+ cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/build-db.txt service-type-database/build-db
+}
+
+pre_configure() {
+ # Without reconfiguration, gtk3 deps are not fully recognized
+ autoreconf -if
+ sed -e 's,-Werror,,g' -i configure
}
+
post_install() {
- rm -rf ${DESTDIR}/usr/lib/python*
# Set 'enable-dbus=warn' option by default to not require dbus.
sed -e 's,\#\(enable-dbus\).*,\1=warn,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf
vsv avahi-daemon
+
+ # Python files are compatible with both 2.7 and 3.x, make both subpackages
+ vmkdir ${py2_lib}
+ vcopy ${DESTDIR}/${py3_sitelib} ${py2_lib}
}
avahi-autoipd_package() {
@@ -56,6 +74,7 @@ avahi-autoipd_package() {
vmove etc/avahi/avahi-autoipd.action
}
}
+
avahi-compat-libs-devel_package() {
depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}"
short_desc="Avahi compat libraries - development files"
@@ -66,6 +85,7 @@ avahi-compat-libs-devel_package() {
vmove usr/lib/libdns_sd.so
}
}
+
avahi-compat-libs_package() {
short_desc="Avahi compatiblity shared libraries"
pkg_install() {
@@ -73,6 +93,7 @@ avahi-compat-libs_package() {
vmove "usr/lib/libdns_sd.so.*"
}
}
+
avahi-libs-devel_package() {
depends="dbus-devel avahi-libs-${version}_${revision}"
short_desc="Avahi core libraries - development files"
@@ -87,6 +108,7 @@ avahi-libs-devel_package() {
vmove usr/lib/libavahi-common.so
}
}
+
avahi-libs_package() {
short_desc="Avahi shared libraries"
pkg_install() {
@@ -95,6 +117,7 @@ avahi-libs_package() {
vmove "usr/lib/libavahi-common.so.*"
}
}
+
avahi-utils_package() {
short_desc="Avahi browsing, publishing and discovery utilities"
pkg_install() {
@@ -104,3 +127,157 @@ avahi-utils_package() {
vmove usr/share/man/man1
}
}
+
+avahi-libevent-libs_package() {
+ short_desc="Avahi libevent integration libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-libevent.so.*"
+ }
+}
+
+avahi-libevent-libs-devel_package() {
+ depends="avahi-libs-devel-${version}_${revision} avahi-libevent-libs-${version}_${revision}"
+ short_desc="Avahi libevent integration libraries - development files"
+ pkg_install() {
+ vmove usr/lib/libavahi-libevent.so
+ vmove "usr/include/avahi-libevent*"
+ vmove "usr/lib/pkgconfig/avahi-libevent*"
+ }
+}
+
+avahi-discover_package() {
+ short_desc="Avahi service-discovery user interface"
+ depends="avahi>=${version}_${revision} avahi-python3>=${version}_${revision}
+ $(vopt_if gir 'gtk+3 python3-gobject')"
+ python_version=3
+ pkg_install() {
+ if [ "$build_option_gir" ]; then
+ vmove usr/bin/avahi-discover
+ vmove usr/share/applications/avahi-discover.desktop
+ fi
+ vmove usr/share/avahi/interfaces/avahi-discover.ui
+ vmove usr/share/man/man1/avahi-discover.1
+ }
+}
+
+avahi-python-utils_package() {
+ build_style=meta
+ archs=noarch
+ short_desc+="Avahi python utilities - transitional dummy pkg"
+ depends="avahi-python3-utils-${version}_${revision}"
+}
+
+avahi-python3-utils_package() {
+ depends="avahi-python3>=${version}_${revision}"
+ short_desc="Avahi python utilities"
+ archs=noarch
+ python_version=3
+ pkg_install() {
+ vmove usr/bin/avahi-bookmarks
+ vmove usr/share/man/man1/avahi-bookmarks.1
+ }
+}
+
+avahi-python_package() {
+ depends="python-dbus"
+ short_desc="Python utility package for Avahi"
+ archs=noarch
+ pkg_install() {
+ vmove ${py2_sitelib}/avahi
+ }
+}
+
+avahi-python3_package() {
+ depends="python3-dbus"
+ short_desc="Python3 utility package for Avahi"
+ archs=noarch
+ pkg_install() {
+ vmove ${py3_sitelib}/avahi
+ }
+}
+
+avahi-glib-libs-devel_package() {
+ depends="avahi-libs-devel>=${version}_${revision} avahi-glib-libs>=${version}_${revision}"
+ short_desc="Avahi glib libraries - development files"
+ pkg_install() {
+ vmove "usr/include/avahi-g*"
+ vmove "usr/lib/pkgconfig/avahi-g*"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ vmove usr/lib/libavahi-glib.so
+ vmove usr/lib/libavahi-gobject.so
+ }
+}
+
+avahi-glib-libs_package() {
+ short_desc="Avahi glib shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-glib.so.*"
+ vmove "usr/lib/libavahi-gobject.so.*"
+ if [ "$build_option_gir" ]; then
+ vmove usr/lib/girepository-1.0
+ fi
+ }
+}
+
+avahi-ui-libs-devel_package() {
+ depends="gtk+-devel gtk+3-devel avahi-libs-devel>=${version}_${revision}
+ avahi-ui-libs>=${version}_${revision} avahi-ui-libs-gtk3>=${version}_${revision}"
+ short_desc="Avahi UI libraries - development files"
+ pkg_install() {
+ vmove usr/include/avahi-ui/avahi-ui.h
+ vmove usr/lib/pkgconfig/avahi-ui.pc
+ vmove usr/lib/pkgconfig/avahi-ui-gtk3.pc
+ vmove usr/lib/libavahi-ui-gtk3.so
+ vmove usr/lib/libavahi-ui.so
+ }
+}
+
+avahi-qt5-libs_package() {
+ short_desc="Avahi Qt5 shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-qt5.so.*"
+ }
+}
+
+avahi-qt5-libs-devel_package() {
+ depends="qt5-devel avahi-libs-devel>=${version}_${revision} avahi-qt5-libs>=${version}_${revision}"
+ short_desc="Avahi QT5 shared libraries - development files"
+ pkg_install() {
+ vmove usr/lib/pkgconfig/avahi-qt5.pc
+ vmove usr/lib/libavahi-qt5.so
+ vmove usr/include/avahi-qt5
+ }
+}
+
+avahi-ui-libs-gtk3_package() {
+ short_desc="Avahi UI GTK+3 shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-ui-gtk3.so.*"
+ }
+}
+
+avahi-ui-libs_package() {
+ short_desc="Avahi UI shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-ui.so.*"
+ }
+}
+
+avahi-ui-utils_package() {
+ depends="desktop-file-utils avahi>=$version"
+ short_desc="Avahi GTK+ utilities"
+ pkg_install() {
+ vmove usr/share/applications/bvnc.desktop
+ vmove usr/share/applications/bssh.desktop
+ vmove usr/share/man/man1/bssh.1
+ if [ "$build_option_gir" ]; then
+ vmove usr/bin/avahi-discover-standalone
+ fi
+ vmove usr/bin/bssh
+ vmove usr/share/man/man1/bvnc.1
+ vmove usr/bin/bvnc
+ vmove usr/bin/bshell
+ }
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Update avahi, take ownership
2020-05-07 20:53 [PR PATCH] Update avahi, take ownership ahesford
` (3 preceding siblings ...)
2020-05-11 18:19 ` ahesford
@ 2020-05-14 12:49 ` ahesford
2020-05-14 13:06 ` [PR PATCH] [Merged]: " Piraty
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ahesford @ 2020-05-14 12:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages avahi
https://github.com/void-linux/void-packages/pull/21731
Update avahi, take ownership
This brings avahi and its subpackages up to date. Included are new libraries to incorporate avahi with libevent or qt5, as new subpackages. Also, the Python parts of avahi are compatible with py3, so there are new `-python3` subpackages as appropriate. The `avahi-python` package is still usable with py2 and has been preserved; `avahi-python-utils` is now an empty meta to bring in the new `avahi-python3-utils`, as the contents of the newer package supplant the older.
EDIT: I've also unified the `avahi-discover` and `avahi` templates. They were separate to avoid dependencies like `gtk+3` in the base packages. However, I've double-checked the dependencies when building all of the subpackages from one template, and these extra dependencies do not leak into the base package. The unification makes maintenance easier and saves build time, because now `avahi-discover` and its subpackages can just copy files from the `avahi` build rather than rebuilding everything (with the potential for mismatched build options) a second time just to extract the UI bits.
A patch file from https://github.com/void-linux/void-packages/pull/21731.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-avahi-21731.patch --]
[-- Type: text/x-diff, Size: 21249 bytes --]
From 2910c68a4ee6e3d726208990a4aff7455b97f944 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 7 May 2020 14:47:34 -0400
Subject: [PATCH] avahi: update to 0.8, unify with avahi-discover
---
common/shlibs | 2 +
srcpkgs/avahi-discover | 1 +
srcpkgs/avahi-discover/template | 169 ----------------------
srcpkgs/avahi-discover/update | 1 -
srcpkgs/avahi-glib-libs | 2 +-
srcpkgs/avahi-glib-libs-devel | 2 +-
srcpkgs/avahi-libevent-libs | 1 +
srcpkgs/avahi-libevent-libs-devel | 1 +
srcpkgs/avahi-python | 2 +-
srcpkgs/avahi-python-utils | 2 +-
srcpkgs/avahi-python3 | 1 +
srcpkgs/avahi-python3-utils | 1 +
srcpkgs/avahi-qt5-libs | 1 +
srcpkgs/avahi-qt5-libs-devel | 1 +
srcpkgs/avahi-ui-libs | 2 +-
srcpkgs/avahi-ui-libs-devel | 2 +-
srcpkgs/avahi-ui-libs-gtk3 | 2 +-
srcpkgs/avahi-ui-utils | 2 +-
srcpkgs/avahi/template | 227 ++++++++++++++++++++++++++----
19 files changed, 219 insertions(+), 203 deletions(-)
create mode 120000 srcpkgs/avahi-discover
delete mode 100644 srcpkgs/avahi-discover/template
delete mode 100644 srcpkgs/avahi-discover/update
create mode 120000 srcpkgs/avahi-libevent-libs
create mode 120000 srcpkgs/avahi-libevent-libs-devel
create mode 120000 srcpkgs/avahi-python3
create mode 120000 srcpkgs/avahi-python3-utils
create mode 120000 srcpkgs/avahi-qt5-libs
create mode 120000 srcpkgs/avahi-qt5-libs-devel
diff --git a/common/shlibs b/common/shlibs
index d7ef5f18ee9..df2ecdd45a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -389,6 +389,8 @@ libdns_sd.so.1 avahi-compat-libs-0.6.25_1
libhowl.so.0 avahi-compat-libs-0.6.25_1
libavahi-ui.so.0 avahi-ui-libs-0.6.25_1
libavahi-ui-gtk3.so.0 avahi-ui-libs-gtk3-0.6.25_1
+libavahi-libevent.so.1 avahi-libevent-libs-0.8_1
+libavahi-qt5.so.1 avahi-qt5-libs-0.8_1
libmp4v2.so.2 libmp4v2-2.0.0_1
libfaac.so.0 faac-1.28_1
libfaad.so.2 faad2-2.7_1
diff --git a/srcpkgs/avahi-discover b/srcpkgs/avahi-discover
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-discover
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
deleted file mode 100644
index 4387c1d584c..00000000000
--- a/srcpkgs/avahi-discover/template
+++ /dev/null
@@ -1,169 +0,0 @@
-# Template file for 'avahi-discover'
-#
-# WARNING: THIS TEMPLATE MUST BE SYNCHRONIZED WITH AVAHI. IT IS SPLITTED TO DROP
-# ADDITIONAL DEPENDENCIES LIKE GTK3 AND PyGI.
-#
-pkgname=avahi-discover
-version=0.7
-revision=8
-wrksrc="avahi-${version}"
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
- --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
- --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
- --with-avahi-priv-access-group=network --with-autoipd-user=avahi
- --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
- --disable-dbm --without-systemdsystemunitdir
- --disable-static ssp_cv_lib=no --enable-python
- --enable-glib --enable-gobject --enable-gtk --enable-gtk3
- $(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
-short_desc="Service discover user interface for avahi"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/lathiat/avahi"
-distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
-checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
-
-hostmakedepends="automake libtool pkg-config intltool
- python-dbus gobject-introspection glib-devel"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
- python-dbus gtk+-devel gtk+3-devel $(vopt_if gir python-gobject-devel)"
-depends="avahi>=${version} avahi-python>=${version}
- $(vopt_if gir 'gtk+3 python-gobject') desktop-file-utils"
-pycompile_module="avahi_discover"
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-pre_configure() {
- autoreconf -fi
- sed -e 's,-Werror,,g' -i configure
-}
-
-do_install() {
- mkdir -p ${wrksrc}/tmpinstall/usr/lib
- ln -s lib ${wrksrc}/tmpinstall/usr/lib32
-
- make DESTDIR=${wrksrc}/tmpinstall install
-
- # Move all required files to ${DESTDIR} now...
- vmkdir usr/bin
- vmkdir usr/share/man/man1
- vmkdir usr/share/applications
- vmkdir usr/include
- vmkdir usr/lib/pkgconfig
- vmkdir usr/share/avahi/interfaces
-
- for f in bvnc bssh bshell avahi-bookmarks $(vopt_if gir avahi-discover) $(vopt_if gir avahi-discover-standalone); do
- mv ${wrksrc}/tmpinstall/usr/bin/${f} ${DESTDIR}/usr/bin
- if [ -f ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ]; then
- mv ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ${DESTDIR}/usr/share/man/man1
- fi
- if [ -f ${wrksrc}/tmpinstall/usr/share/applications/${f}.desktop ]; then
- mv ${wrksrc}/tmpinstall/usr/share/applications/${f}.desktop ${DESTDIR}/usr/share/applications
- fi
- done
- mv ${wrksrc}/tmpinstall/usr/include/avahi-g* ${DESTDIR}/usr/include
- mv ${wrksrc}/tmpinstall/usr/include/avahi-ui* ${DESTDIR}/usr/include
- mv ${wrksrc}/tmpinstall/usr/lib/python2.7 ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/*avahi-g* ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/*avahi-ui* ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-g* ${DESTDIR}/usr/lib/pkgconfig
- mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-ui* ${DESTDIR}/usr/lib/pkgconfig
- mv ${wrksrc}/tmpinstall/usr/share/avahi/interfaces/*.ui ${DESTDIR}/usr/share/avahi/interfaces
- if [ "$build_option_gir" ]; then
- mv ${wrksrc}/tmpinstall/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
- mv ${wrksrc}/tmpinstall/usr/share/gir-1.0 ${DESTDIR}/usr/share
- fi
-}
-
-avahi-python-utils_package() {
- depends="avahi-python>=$version"
- short_desc="Avahi python utilities"
- archs=noarch
- pkg_install() {
- vmove usr/bin/avahi-bookmarks
- vmove "usr/share/man/man1/avahi-bookmarks*"
- }
-}
-
-avahi-python_package() {
- depends="python-dbus"
- short_desc="Python utility package for Avahi"
- archs=noarch
- pycompile_module="avahi"
- pkg_install() {
- vmove usr/lib/python2.7/site-packages/avahi
- }
-}
-
-avahi-glib-libs-devel_package() {
- depends="avahi-libs-devel>=${version}_${revision} avahi-glib-libs>=${version}_${revision}"
- short_desc="Avahi glib libraries - development files"
- pkg_install() {
- vmove "usr/include/avahi-g*"
- vmove "usr/lib/pkgconfig/avahi-g*"
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- vmove usr/lib/libavahi-glib.so
- vmove usr/lib/libavahi-gobject.so
- }
-}
-
-avahi-glib-libs_package() {
- short_desc="Avahi glib shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-glib.so.*"
- vmove "usr/lib/libavahi-gobject.so.*"
- if [ "$build_option_gir" ]; then
- vmove usr/lib/girepository-1.0
- fi
- }
-}
-
-avahi-ui-libs-devel_package() {
- depends="gtk+-devel gtk+3-devel avahi-libs-devel>=${version}_${revision}
- avahi-ui-libs>=${version}_${revision} avahi-ui-libs-gtk3>=${version}_${revision}"
- short_desc="Avahi UI libraries - development files"
- pkg_install() {
- vmove usr/include/avahi-ui/avahi-ui.h
- vmove usr/lib/pkgconfig/avahi-ui.pc
- vmove usr/lib/pkgconfig/avahi-ui-gtk3.pc
- vmove usr/lib/libavahi-ui-gtk3.so
- vmove usr/lib/libavahi-ui.so
- }
-}
-
-avahi-ui-libs-gtk3_package() {
- short_desc="Avahi UI GTK+3 shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-ui-gtk3.so.*"
- }
-}
-
-avahi-ui-libs_package() {
- short_desc="Avahi UI shared libraries"
- pkg_install() {
- vmove "usr/lib/libavahi-ui.so.*"
- }
-}
-
-avahi-ui-utils_package() {
- depends="desktop-file-utils avahi>=$version"
- short_desc="Avahi GTK+ utilities"
- pkg_install() {
- vmove usr/share/applications/bvnc.desktop
- vmove usr/share/applications/bssh.desktop
- vmove usr/share/man/man1/bssh.1
- if [ "$build_option_gir" ]; then
- vmove usr/bin/avahi-discover-standalone
- fi
- vmove usr/bin/bssh
- vmove usr/share/man/man1/bvnc.1
- vmove usr/bin/bvnc
- vmove usr/bin/bshell
- }
-}
diff --git a/srcpkgs/avahi-discover/update b/srcpkgs/avahi-discover/update
deleted file mode 100644
index b8bee1a9ab5..00000000000
--- a/srcpkgs/avahi-discover/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="avahi"
diff --git a/srcpkgs/avahi-glib-libs b/srcpkgs/avahi-glib-libs
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-glib-libs
+++ b/srcpkgs/avahi-glib-libs
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-glib-libs-devel b/srcpkgs/avahi-glib-libs-devel
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-glib-libs-devel
+++ b/srcpkgs/avahi-glib-libs-devel
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-libevent-libs b/srcpkgs/avahi-libevent-libs
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-libevent-libs
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-libevent-libs-devel b/srcpkgs/avahi-libevent-libs-devel
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-libevent-libs-devel
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python b/srcpkgs/avahi-python
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-python
+++ b/srcpkgs/avahi-python
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python-utils b/srcpkgs/avahi-python-utils
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-python-utils
+++ b/srcpkgs/avahi-python-utils
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python3 b/srcpkgs/avahi-python3
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-python3
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python3-utils b/srcpkgs/avahi-python3-utils
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-python3-utils
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs b/srcpkgs/avahi-qt5-libs
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-qt5-libs
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs-devel b/srcpkgs/avahi-qt5-libs-devel
new file mode 120000
index 00000000000..3d497a72746
--- /dev/null
+++ b/srcpkgs/avahi-qt5-libs-devel
@@ -0,0 +1 @@
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs b/srcpkgs/avahi-ui-libs
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs
+++ b/srcpkgs/avahi-ui-libs
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs-devel b/srcpkgs/avahi-ui-libs-devel
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs-devel
+++ b/srcpkgs/avahi-ui-libs-devel
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs-gtk3 b/srcpkgs/avahi-ui-libs-gtk3
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-libs-gtk3
+++ b/srcpkgs/avahi-ui-libs-gtk3
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-utils b/srcpkgs/avahi-ui-utils
index 19fb54cd099..3d497a72746 120000
--- a/srcpkgs/avahi-ui-utils
+++ b/srcpkgs/avahi-ui-utils
@@ -1 +1 @@
-avahi-discover
\ No newline at end of file
+avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 199cbd4e057..f472ddb28b6 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,26 +1,38 @@
# Template file for 'avahi'
pkgname=avahi
-version=0.7
-revision=9
+version=0.8
+revision=1
build_style=gnu-configure
+build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
- --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
- --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
- --with-avahi-priv-access-group=network --with-autoipd-user=avahi
- --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
- --disable-static ssp_cv_lib=no --enable-python
- --disable-glib --disable-python-dbus --disable-gobject --disable-gtk
- --disable-gtk3 --disable-dbm --disable-introspection --sbindir=/usr/bin
- --disable-pygobject"
+ --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
+ --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
+ --with-avahi-priv-access-group=network --with-autoipd-user=avahi
+ --with-autoipd-group=avahi --with-distro=none --enable-xmltoman
+ --disable-static ssp_cv_lib=no --disable-dbm --enable-python
+ --enable-glib --enable-gobject --enable-qt5 --enable-gtk --enable-gtk3
+ --sbindir=/usr/bin --without-systemdsystemunitdir
+ --with-dbus-system-address=unix:path=/run/dbus/system_bus_socket
+ $(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
short_desc="Multicast DNS Service Discovery"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/lathiat/avahi"
-distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
-checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
+### NOTE: The Avahi 0.8 release tarball is broken; it is missing the build-db
+### script. Fetching and manipulation of this file in post_extract should be
+### undone in a future release that fixes this oversight.
+distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz
+ https://raw.githubusercontent.com/lathiat/${pkgname}/v${version}/service-type-database/build-db>build-db.txt"
+checksum="060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
+ 83edd888ccc464ab032134a45b7ded3bc43cb1dda2cd921ff47b01949d98ed7c"
+skip_extraction="build-db.txt"
-hostmakedepends="pkg-config intltool python"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
+hostmakedepends="pkg-config intltool xmltoman glib-devel automake
+ libtool gettext-devel python3 python3-dbus qt5-host-tools
+ $(vopt_if gir gobject-introspection)"
+makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
+ libevent-devel glib-devel python3-dbus gtk+-devel
+ gtk+3-devel qt5-devel $(vopt_if gir python-gobject-devel)"
conf_files="
/etc/avahi/services/ssh.service
/etc/avahi/services/sftp-ssh.service
@@ -29,22 +41,28 @@ conf_files="
/etc/avahi/avahi-dnsconfd.action"
system_accounts="avahi:23"
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" automake libtool glib-devel"
- pre_configure() {
- autoreconf -if
- }
-fi
+build_options="gir"
+build_options_default="gir"
post_extract() {
- # Switch to /run to not depend on /var/run being a symlink.
- sed -e 's,\(avahi_runtime_dir=\).*,\1\"/run\",' -i ${wrksrc}/configure
+ # Avahi 0.8 release mistaken left build-db out of release tarball
+ cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/build-db.txt service-type-database/build-db
+}
+
+pre_configure() {
+ # Without reconfiguration, gtk3 deps are not fully recognized
+ autoreconf -if
+ vsed -e 's,-Werror,,g' -i configure
}
+
post_install() {
- rm -rf ${DESTDIR}/usr/lib/python*
# Set 'enable-dbus=warn' option by default to not require dbus.
- sed -e 's,\#\(enable-dbus\).*,\1=warn,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf
+ vsed -e 's,\#\(enable-dbus\).*,\1=warn,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf
vsv avahi-daemon
+
+ # Python files are compatible with both 2.7 and 3.x, make both subpackages
+ vmkdir ${py2_lib}
+ vcopy ${DESTDIR}/${py3_sitelib} ${py2_lib}
}
avahi-autoipd_package() {
@@ -56,6 +74,7 @@ avahi-autoipd_package() {
vmove etc/avahi/avahi-autoipd.action
}
}
+
avahi-compat-libs-devel_package() {
depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}"
short_desc="Avahi compat libraries - development files"
@@ -66,6 +85,7 @@ avahi-compat-libs-devel_package() {
vmove usr/lib/libdns_sd.so
}
}
+
avahi-compat-libs_package() {
short_desc="Avahi compatiblity shared libraries"
pkg_install() {
@@ -73,6 +93,7 @@ avahi-compat-libs_package() {
vmove "usr/lib/libdns_sd.so.*"
}
}
+
avahi-libs-devel_package() {
depends="dbus-devel avahi-libs-${version}_${revision}"
short_desc="Avahi core libraries - development files"
@@ -87,6 +108,7 @@ avahi-libs-devel_package() {
vmove usr/lib/libavahi-common.so
}
}
+
avahi-libs_package() {
short_desc="Avahi shared libraries"
pkg_install() {
@@ -95,6 +117,7 @@ avahi-libs_package() {
vmove "usr/lib/libavahi-common.so.*"
}
}
+
avahi-utils_package() {
short_desc="Avahi browsing, publishing and discovery utilities"
pkg_install() {
@@ -104,3 +127,157 @@ avahi-utils_package() {
vmove usr/share/man/man1
}
}
+
+avahi-libevent-libs_package() {
+ short_desc="Avahi libevent integration libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-libevent.so.*"
+ }
+}
+
+avahi-libevent-libs-devel_package() {
+ depends="avahi-libs-devel-${version}_${revision} avahi-libevent-libs-${version}_${revision}"
+ short_desc="Avahi libevent integration libraries - development files"
+ pkg_install() {
+ vmove usr/lib/libavahi-libevent.so
+ vmove "usr/include/avahi-libevent*"
+ vmove "usr/lib/pkgconfig/avahi-libevent*"
+ }
+}
+
+avahi-discover_package() {
+ short_desc="Avahi service-discovery user interface"
+ depends="avahi>=${version}_${revision} avahi-python3>=${version}_${revision}
+ $(vopt_if gir 'gtk+3 python3-gobject')"
+ python_version=3
+ pkg_install() {
+ if [ "$build_option_gir" ]; then
+ vmove usr/bin/avahi-discover
+ vmove usr/share/applications/avahi-discover.desktop
+ fi
+ vmove usr/share/avahi/interfaces/avahi-discover.ui
+ vmove usr/share/man/man1/avahi-discover.1
+ }
+}
+
+avahi-python-utils_package() {
+ build_style=meta
+ archs=noarch
+ short_desc+="Avahi python utilities - transitional dummy pkg"
+ depends="avahi-python3-utils-${version}_${revision}"
+}
+
+avahi-python3-utils_package() {
+ depends="avahi-python3>=${version}_${revision}"
+ short_desc="Avahi python utilities"
+ archs=noarch
+ python_version=3
+ pkg_install() {
+ vmove usr/bin/avahi-bookmarks
+ vmove usr/share/man/man1/avahi-bookmarks.1
+ }
+}
+
+avahi-python_package() {
+ depends="python-dbus"
+ short_desc="Python utility package for Avahi"
+ archs=noarch
+ pkg_install() {
+ vmove ${py2_sitelib}/avahi
+ }
+}
+
+avahi-python3_package() {
+ depends="python3-dbus"
+ short_desc="Python3 utility package for Avahi"
+ archs=noarch
+ pkg_install() {
+ vmove ${py3_sitelib}/avahi
+ }
+}
+
+avahi-glib-libs-devel_package() {
+ depends="avahi-libs-devel>=${version}_${revision} avahi-glib-libs>=${version}_${revision}"
+ short_desc="Avahi glib libraries - development files"
+ pkg_install() {
+ vmove "usr/include/avahi-g*"
+ vmove "usr/lib/pkgconfig/avahi-g*"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ vmove usr/lib/libavahi-glib.so
+ vmove usr/lib/libavahi-gobject.so
+ }
+}
+
+avahi-glib-libs_package() {
+ short_desc="Avahi glib shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-glib.so.*"
+ vmove "usr/lib/libavahi-gobject.so.*"
+ if [ "$build_option_gir" ]; then
+ vmove usr/lib/girepository-1.0
+ fi
+ }
+}
+
+avahi-ui-libs-devel_package() {
+ depends="gtk+-devel gtk+3-devel avahi-libs-devel>=${version}_${revision}
+ avahi-ui-libs>=${version}_${revision} avahi-ui-libs-gtk3>=${version}_${revision}"
+ short_desc="Avahi UI libraries - development files"
+ pkg_install() {
+ vmove usr/include/avahi-ui/avahi-ui.h
+ vmove usr/lib/pkgconfig/avahi-ui.pc
+ vmove usr/lib/pkgconfig/avahi-ui-gtk3.pc
+ vmove usr/lib/libavahi-ui-gtk3.so
+ vmove usr/lib/libavahi-ui.so
+ }
+}
+
+avahi-qt5-libs_package() {
+ short_desc="Avahi Qt5 shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-qt5.so.*"
+ }
+}
+
+avahi-qt5-libs-devel_package() {
+ depends="qt5-devel avahi-libs-devel>=${version}_${revision} avahi-qt5-libs>=${version}_${revision}"
+ short_desc="Avahi QT5 shared libraries - development files"
+ pkg_install() {
+ vmove usr/lib/pkgconfig/avahi-qt5.pc
+ vmove usr/lib/libavahi-qt5.so
+ vmove usr/include/avahi-qt5
+ }
+}
+
+avahi-ui-libs-gtk3_package() {
+ short_desc="Avahi UI GTK+3 shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-ui-gtk3.so.*"
+ }
+}
+
+avahi-ui-libs_package() {
+ short_desc="Avahi UI shared libraries"
+ pkg_install() {
+ vmove "usr/lib/libavahi-ui.so.*"
+ }
+}
+
+avahi-ui-utils_package() {
+ depends="desktop-file-utils avahi>=$version"
+ short_desc="Avahi GTK+ utilities"
+ pkg_install() {
+ vmove usr/share/applications/bvnc.desktop
+ vmove usr/share/applications/bssh.desktop
+ vmove usr/share/man/man1/bssh.1
+ if [ "$build_option_gir" ]; then
+ vmove usr/bin/avahi-discover-standalone
+ fi
+ vmove usr/bin/bssh
+ vmove usr/share/man/man1/bvnc.1
+ vmove usr/bin/bvnc
+ vmove usr/bin/bshell
+ }
+}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: Update avahi, take ownership
2020-05-07 20:53 [PR PATCH] Update avahi, take ownership ahesford
` (4 preceding siblings ...)
2020-05-14 12:49 ` ahesford
@ 2020-05-14 13:06 ` Piraty
2020-05-29 12:09 ` Johnnynator
2020-05-29 14:46 ` ahesford
7 siblings, 0 replies; 9+ messages in thread
From: Piraty @ 2020-05-14 13:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1227 bytes --]
There's a merged pull request on the void-packages repository
Update avahi, take ownership
https://github.com/void-linux/void-packages/pull/21731
Description:
This brings avahi and its subpackages up to date. Included are new libraries to incorporate avahi with libevent or qt5, as new subpackages. Also, the Python parts of avahi are compatible with py3, so there are new `-python3` subpackages as appropriate. The `avahi-python` package is still usable with py2 and has been preserved; `avahi-python-utils` is now an empty meta to bring in the new `avahi-python3-utils`, as the contents of the newer package supplant the older.
EDIT: I've also unified the `avahi-discover` and `avahi` templates. They were separate to avoid dependencies like `gtk+3` in the base packages. However, I've double-checked the dependencies when building all of the subpackages from one template, and these extra dependencies do not leak into the base package. The unification makes maintenance easier and saves build time, because now `avahi-discover` and its subpackages can just copy files from the `avahi` build rather than rebuilding everything (with the potential for mismatched build options) a second time just to extract the UI bits.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Update avahi, take ownership
2020-05-07 20:53 [PR PATCH] Update avahi, take ownership ahesford
` (5 preceding siblings ...)
2020-05-14 13:06 ` [PR PATCH] [Merged]: " Piraty
@ 2020-05-29 12:09 ` Johnnynator
2020-05-29 14:46 ` ahesford
7 siblings, 0 replies; 9+ messages in thread
From: Johnnynator @ 2020-05-29 12:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/21731#issuecomment-635937655
Comment:
You can take a second attempt at updating it, but pls don't merge the templates, since it introduces build cycles.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Update avahi, take ownership
2020-05-07 20:53 [PR PATCH] Update avahi, take ownership ahesford
` (6 preceding siblings ...)
2020-05-29 12:09 ` Johnnynator
@ 2020-05-29 14:46 ` ahesford
7 siblings, 0 replies; 9+ messages in thread
From: ahesford @ 2020-05-29 14:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/21731#issuecomment-636013975
Comment:
Fixed in #22406
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-05-29 14:46 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-07 20:53 [PR PATCH] Update avahi, take ownership ahesford
2020-05-09 16:35 ` [PR PATCH] [Updated] " ahesford
2020-05-09 16:40 ` ahesford
2020-05-09 21:14 ` ahesford
2020-05-11 18:19 ` ahesford
2020-05-14 12:49 ` ahesford
2020-05-14 13:06 ` [PR PATCH] [Merged]: " Piraty
2020-05-29 12:09 ` Johnnynator
2020-05-29 14:46 ` ahesford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).