Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=3f27909c66a21328ce677da85eef841bc0d4792b

commit 3f27909c66a21328ce677da85eef841bc0d4792b
Author: crazy <[email protected]>
Date:   Wed Jan 31 04:54:30 2018 +0100

avahi-0.7-6-x86_64

* rebuild with tc
* add $USE_GTK3 , OFF by default .. 5 subpackages are
guarded by GTK3 now ..

diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild
index 3920707..d021c19 100644
--- a/source/network/avahi/FrugalBuild
+++ b/source/network/avahi/FrugalBuild
@@ -2,14 +2,16 @@
# Maintainer: DeX77 <[email protected]>
# Contributor: AlexExtreme <[email protected]>

+USE_GTK3=${USE_GTK3:-"n"}
+
pkgname=avahi
pkgver=0.7
-pkgrel=5
+pkgrel=6
pkgdesc="A multicast/unicast DNS-SD framework"
archs=("x86_64")
url="http://www.avahi.org";
groups=('network')
-depends=('libssp>=6.2.1-5' 'gdbm>=1.12-2' 'libdaemon>=0.14-4' 
'dbus>=1.10.10-3' 'libsystemd>=231-6' 'expat>=2.1.0-6')
+depends=('libssp>=7.3.0-5' 'gdbm>=1.12-2' 'libdaemon>=0.14-4' 
'dbus>=1.10.10-3' 'libsystemd>=231-6' 'expat>=2.1.0-6')
makedepends=('systemd>=231-6' 'x11-protos' 'intltool')
rodepends=('shadow>=4.2.1-5')
backup=(etc/avahi/avahi-daemon.conf)
@@ -38,7 +40,7 @@ subinstall=("")

subpkgs+=("$pkgname-glib")
subdescs+=('Glib bindings for Avahi')
-subdepends+=("glib2>=2.50.0 libffi>=3.2.1-")
+subdepends+=("glib2>=2.50.0 libffi>=3.2.1")
subrodepends+=("")
subgroups+=('lib')
subarchs+=("x86_64")
@@ -46,23 +48,15 @@ subinstall+=("")

subpkgs+=("lib32-$pkgname-glib")
subdescs+=('Glib bindings for Avahi (32-Bit)')
-subdepends+=("lib32-glib2>=2.50.0 lib32-libffi>=3.2.1-")
+subdepends+=("lib32-glib2>=2.50.0 lib32-libffi>=3.2.1")
subrodepends+=("")
subgroups+=('lib32-extra')
subarchs+=("x86_64")
subinstall+=("")

-subpkgs+=("avahi-python")
-subdescs+=('Python bindings for Avahi')
-subdepends+=("python>=2.7.12-2 dbus-python>=1.2.0-7 pygobject3")
-subrodepends+=("")
-subgroups+=('lib')
-subarchs+=("x86_64")
-subinstall+=("")
-
subpkgs+=("avahi-compat")
subdescs+=('mDNSresponder and Howl compatibility libraries/headers for Avahi')
-subdepends+=("libssp>=6.2.1-5")
+subdepends+=("libssp>=7.3.0-5")
subrodepends+=("")
subgroups+=('lib')
subarchs+=("x86_64")
@@ -70,7 +64,7 @@ subinstall+=("")

subpkgs+=("lib32-avahi-compat")
subdescs+=('mDNSresponder and Howl compatibility libraries/headers for Avahi 
(32-Bit)')
-subdepends+=("lib32-libssp>=6.2.1-5")
+subdepends+=("lib32-libssp>=7.3.0-5")
subrodepends+=("")
subgroups+=('lib32-extra')
subarchs+=("x86_64")
@@ -78,51 +72,62 @@ subinstall+=("")

subpkgs+=("avahi-dnsconfd")
subdescs+=('Discovers DNS servers broadcast with Avahi on a local network')
-subdepends+=("libdaemon>=0.14-5 libssp>=6.2.1-5")
+subdepends+=("libdaemon>=0.14-5 libssp>=7.3.0-5")
subrodepends+=("")
subgroups+=('network')
subarchs+=("x86_64")
subinstall+=("$pkgname.install")

-subpkgs+=("avahi-discover")
-subdescs+=('Avahi discover GUI')
-subdepends+=("")
-subrodepends+=("avahi-python avahi-ui")
-subgroups+=('network-extra')
-subarchs+=("x86_64")
-subinstall+=("")
-
-subpkgs+=("avahi-bshell")
-subdescs+=('Avahi bshell')
-subdepends+=("")
-subrodepends+=("avahi-ui")
-subgroups+=('network-extra')
-subarchs+=("x86_64")
-subinstall+=("")
-
-subpkgs+=("avahi-bssh")
-subdescs+=('Avahi bssh')
-subdepends+=("")
-subrodepends+=("avahi-ui")
-subgroups+=('network-extra')
-subarchs+=("x86_64")
-subinstall+=("")
-
-subpkgs+=("avahi-bvnc")
-subdescs+=('Avahi bvnc')
-subdepends+=("")
-subrodepends+=("avahi-ui")
-subgroups+=('network-extra')
-subarchs+=("x86_64")
-subinstall+=("")
-
-subpkgs+=("avahi-ui")
-subdescs+=('Avahi UI stuff')
-subdepends+=("gtk+3")
-subrodepends+=("")
-subgroups+=('network-extra')
-subarchs+=("x86_64")
-subinstall+=("")
+if Fuse $USE_GTK3; then
+       ##  all that need GTK
+       subpkgs+=("avahi-python")
+       subdescs+=('Python bindings for Avahi')
+       subdepends+=("python>=2.7.12-2 dbus-python>=1.2.0-7 pygobject3")
+       subrodepends+=("")
+       subgroups+=('lib')
+       subarchs+=("x86_64")
+       subinstall+=("")
+
+       subpkgs+=("avahi-discover")
+       subdescs+=('Avahi discover GUI')
+       subdepends+=("")
+       subrodepends+=("avahi-python avahi-ui")
+       subgroups+=('network-extra')
+       subarchs+=("x86_64")
+       subinstall+=("")
+
+       subpkgs+=("avahi-bshell")
+       subdescs+=('Avahi bshell')
+       subdepends+=("")
+       subrodepends+=("avahi-ui")
+       subgroups+=('network-extra')
+       subarchs+=("x86_64")
+       subinstall+=("")
+
+       subpkgs+=("avahi-bssh")
+       subdescs+=('Avahi bssh')
+       subdepends+=("")
+       subrodepends+=("avahi-ui")
+       subgroups+=('network-extra')
+       subarchs+=("x86_64")
+       subinstall+=("")
+
+       subpkgs+=("avahi-bvnc")
+       subdescs+=('Avahi bvnc')
+       subdepends+=("")
+       subrodepends+=("avahi-ui")
+       subgroups+=('network-extra')
+       subarchs+=("x86_64")
+       subinstall+=("")
+
+       subpkgs+=("avahi-ui")
+       subdescs+=('Avahi UI stuff')
+       subdepends+=("gtk+3")
+       subrodepends+=("")
+       subgroups+=('network-extra')
+       subarchs+=("x86_64")
+       subinstall+=("")
+fi


Fconfopts+="    --disable-qt4 \
@@ -141,12 +146,20 @@ Fconfopts+="      --disable-qt4 \
--with-autoipd-group=avahi \
--with-systemdsystemunitdir=/lib/systemd/system"

+if Fuse $USE_GTK3; then
+       Fconfopts+=" --enable-gtk3 --enable-python"
+else
+       Fconfopts+=" --disable-gtk3 --disable-python"
+fi
+
+
F32confopts="   --disable-gtk3"

build() {


## no GTK/QT/MONO stuff .. maybe on next release , broken for now
+       ## GTK3 optional and OFF by default
Fbuild_cross32

Fdoc README.Frugalware
@@ -174,9 +187,6 @@ build() {
Fsplit lib32-avahi-glib usr/lib32/libavahi-{glib,gobject}*
Fsplit lib32-avahi-glib usr/lib32/pkgconfig/avahi-{glib,gobject}.pc

-       # avahi-python
-       Fsplit avahi-python usr/lib/python*
-
# avahi-compat
Fsplit avahi-compat usr/lib/libhowl*
Fsplit avahi-compat usr/lib/libdns_sd*
@@ -206,21 +216,26 @@ build() {
# fix for chroot.c: open() failed: No such file or directory
Ffile etc/systemd/system/avahi-daemon.service.d/ad.conf

-       Fsplit avahi-discover usr/share/applications/avahi-discover.desktop
-       Fsplit avahi-discover usr/bin/avahi-discover
-       Fsplit avahi-discover usr/bin/avahi-discover-standalone
-       Fsplit avahi-discover usr/share/avahi/interfaces/avahi-discover.ui
-
-       Fsplit avahi-ui usr/lib/pkgconfig/avahi-ui-gtk3.pc
-       Fsplit avahi-ui usr/include/avahi-ui/
-       Fsplit avahi-ui usr/lib/libavahi-ui*
-       Fsplit avahi-ui usr/share/avahi/interfaces/
-
-       Fsplit avahi-bshell usr/bin/bshell
-       Fsplit avahi-bssh usr/bin/bssh
-       Fsplit avahi-bvnc usr/bin/bvnc
-       Fsplit avahi-bssh usr/share/applications/bssh.desktop
-       Fsplit avahi-bvnc usr/share/applications/bvnc.desktop
+       if Fuse $USE_GTK3; then
+
+               Fsplit avahi-python usr/lib/python*
+
+               Fsplit avahi-discover 
usr/share/applications/avahi-discover.desktop
+               Fsplit avahi-discover usr/bin/avahi-discover
+               Fsplit avahi-discover usr/bin/avahi-discover-standalone
+               Fsplit avahi-discover 
usr/share/avahi/interfaces/avahi-discover.ui
+
+               Fsplit avahi-ui usr/lib/pkgconfig/avahi-ui-gtk3.pc
+               Fsplit avahi-ui usr/include/avahi-ui/
+               Fsplit avahi-ui usr/lib/libavahi-ui*
+               Fsplit avahi-ui usr/share/avahi/interfaces/
+
+               Fsplit avahi-bshell usr/bin/bshell
+               Fsplit avahi-bssh usr/bin/bssh
+               Fsplit avahi-bvnc usr/bin/bvnc
+               Fsplit avahi-bssh usr/share/applications/bssh.desktop
+               Fsplit avahi-bvnc usr/share/applications/bvnc.desktop
+       fi

Fgenscriptlet
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to