Github messages for voidlinux
 help / color / mirror / Atom feed
* [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
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).