Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory vz-cvs-3.sog:/tmp/cvs-serv24517
Modified Files:
avahi-ui.info avahi-ui.patch libavahi-glib1-dev.info
Log Message:
new version (bindings now in sync with underlying avahi library)
Index: avahi-ui.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/avahi-ui.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- avahi-ui.patch 12 Jun 2009 15:25:21 -0000 1.2
+++ avahi-ui.patch 27 Jul 2011 00:17:00 -0000 1.3
@@ -1,34 +1,34 @@
-diff -Nurd avahi-0.6.25/avahi-discover-standalone/Makefile.in
avahi-0.6.25-new/avahi-discover-standalone/Makefile.in
---- avahi-0.6.25/avahi-discover-standalone/Makefile.in 2009-04-13
21:57:14.000000000 -0400
-+++ avahi-0.6.25-new/avahi-discover-standalone/Makefile.in 2009-06-12
11:06:48.000000000 -0400
-@@ -80,9 +80,7 @@
- avahi_discover_standalone_OBJECTS = \
- $(am_avahi_discover_standalone_OBJECTS)
- am__DEPENDENCIES_1 =
--@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@avahi_discover_standalone_DEPENDENCIES =
../avahi-common/libavahi-common.la \
--@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ ../avahi-glib/libavahi-glib.la \
--@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ ../avahi-core/libavahi-core.la \
-+@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@avahi_discover_standalone_DEPENDENCIES = \
- @HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) \
- @HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) \
- @HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1)
-@@ -360,9 +358,9 @@
-
- @HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@avahi_discover_standalone_LDADD = \
- @HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ $(AM_LDADD) \
--@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ ../avahi-common/libavahi-common.la \
--@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ ../avahi-glib/libavahi-glib.la \
--@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ ../avahi-core/libavahi-core.la \
-+@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ -lavahi-common \
-+@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ -lavahi-glib \
-+@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ -lavahi-core \
- @HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ $(GLIB20_LIBS) $(GTK20_LIBS)
$(GLADE20_LIBS)
-
- @HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@interfaces_DATA = $(interfaces)
-diff -Nurd avahi-0.6.25/avahi-glib/Makefile.in
avahi-0.6.25-new/avahi-glib/Makefile.in
---- avahi-0.6.25/avahi-glib/Makefile.in 2009-04-13 21:57:14.000000000
-0400
-+++ avahi-0.6.25-new/avahi-glib/Makefile.in 2009-06-12 11:06:48.000000000
-0400
-@@ -87,7 +87,7 @@
+diff -Nurd avahi-0.6.30/avahi-discover-standalone/Makefile.in
avahi-0.6.30-new/avahi-discover-standalone/Makefile.in
+--- avahi-0.6.30/avahi-discover-standalone/Makefile.in 2011-04-03
18:10:45.000000000 -0400
++++ avahi-0.6.30-new/avahi-discover-standalone/Makefile.in 2011-07-26
19:58:21.000000000 -0400
+@@ -97,9 +97,7 @@
+ @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@am__DEPENDENCIES_2 =
$(am__DEPENDENCIES_1)
+ @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@am__DEPENDENCIES_3 =
$(am__DEPENDENCIES_1) \
+ @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@ $(am__DEPENDENCIES_1)
+-@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@avahi_discover_standalone_DEPENDENCIES =
../avahi-common/libavahi-common.la \
+-@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-glib/libavahi-glib.la \
+-@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-core/libavahi-core.la \
++@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@avahi_discover_standalone_DEPENDENCIES = \
+ @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_2) \
+ @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_3)
+ AM_V_lt = $(am__v_lt_$(V))
+@@ -422,9 +420,9 @@
+ @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_3)
+ @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@avahi_discover_standalone_LDADD = \
+ @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(AM_LDADD) \
+-@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-common/libavahi-common.la \
+-@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-glib/libavahi-glib.la \
+-@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ ../avahi-core/libavahi-core.la \
++@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ -lavahi-common \
++@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ -lavahi-glib \
++@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ -lavahi-core \
+ @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_2) \
+ @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_4)
+ @HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@interfaces_DATA = $(interfaces)
+diff -Nurd avahi-0.6.30/avahi-glib/Makefile.in
avahi-0.6.30-new/avahi-glib/Makefile.in
+--- avahi-0.6.30/avahi-glib/Makefile.in 2011-04-03 18:10:45.000000000
-0400
++++ avahi-0.6.30-new/avahi-glib/Makefile.in 2011-07-26 19:56:11.000000000
-0400
+@@ -104,7 +104,7 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@HAVE_GLIB_TRUE@libavahi_glib_la_DEPENDENCIES = \
@@ -37,16 +37,16 @@
@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1)
am__libavahi_glib_la_SOURCES_DIST = glib-watch.c glib-watch.h \
glib-malloc.h glib-malloc.c
-@@ -107,7 +107,7 @@
+@@ -128,7 +128,7 @@
@HAVE_GLIB_TRUE@ glib_watch_test-glib-watch-test.$(OBJEXT)
glib_watch_test_OBJECTS = $(am_glib_watch_test_OBJECTS)
@HAVE_GLIB_TRUE@glib_watch_test_DEPENDENCIES = \
-@HAVE_GLIB_TRUE@ ../avahi-common/libavahi-common.la \
+@HAVE_GLIB_TRUE@ -lavahi-common \
@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1)
- glib_watch_test_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(glib_watch_test_CFLAGS) \
-@@ -378,14 +378,14 @@
+ glib_watch_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+@@ -428,14 +428,14 @@
@HAVE_GLIB_TRUE@ glib-malloc.h glib-malloc.c
@HAVE_GLIB_TRUE@libavahi_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
@@ -63,11 +63,11 @@
all: all-am
.SUFFIXES:
-diff -Nurd avahi-0.6.25/avahi-gobject/Makefile.in
avahi-0.6.25-new/avahi-gobject/Makefile.in
---- avahi-0.6.25/avahi-gobject/Makefile.in 2009-04-13 21:57:14.000000000
-0400
-+++ avahi-0.6.25-new/avahi-gobject/Makefile.in 2009-06-12 11:06:48.000000000
-0400
-@@ -83,9 +83,7 @@
- libLTLIBRARIES_INSTALL = $(INSTALL)
+diff -Nurd avahi-0.6.30/avahi-gobject/Makefile.in
avahi-0.6.30-new/avahi-gobject/Makefile.in
+--- avahi-0.6.30/avahi-gobject/Makefile.in 2011-04-03 18:10:46.000000000
-0400
++++ avahi-0.6.30-new/avahi-gobject/Makefile.in 2011-07-26 19:56:11.000000000
-0400
+@@ -104,9 +104,7 @@
+ "$(DESTDIR)$(avahigobjectincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
-@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@libavahi_gobject_la_DEPENDENCIES =
../avahi-common/libavahi-common.la \
@@ -77,7 +77,7 @@
@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ $(am__DEPENDENCIES_1)
am__libavahi_gobject_la_SOURCES_DIST = ga-client.c ga-client.h \
ga-entry-group.c ga-entry-group.h ga-enums.h ga-error.c \
-@@ -408,7 +406,7 @@
+@@ -464,7 +462,7 @@
@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@ $(BUILT_SOURCES)
@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@libavahi_gobject_la_CFLAGS = $(AM_CFLAGS)
$(GOBJECT_CFLAGS)
@@ -86,46 +86,48 @@
@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@libavahi_gobject_la_LDFLAGS =
$(AM_LDFLAGS) -version-info $(LIBAVAHI_GOBJECT_VERSION_INFO)
-export-symbols-regex '^ga_'
# correctly clean the generated source files
-diff -Nurd avahi-0.6.25/avahi-ui/Makefile.in
avahi-0.6.25-new/avahi-ui/Makefile.in
---- avahi-0.6.25/avahi-ui/Makefile.in 2009-04-13 21:57:15.000000000 -0400
-+++ avahi-0.6.25-new/avahi-ui/Makefile.in 2009-06-12 11:16:35.000000000
-0400
-@@ -94,9 +94,7 @@
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_DEPENDENCIES =
../avahi-common/libavahi-common.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@
../avahi-client/libavahi-client.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@
../avahi-glib/libavahi-glib.la \
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_DEPENDENCIES = \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1)
+diff -Nurd avahi-0.6.30/avahi-ui/Makefile.in
avahi-0.6.30-new/avahi-ui/Makefile.in
+--- avahi-0.6.30/avahi-ui/Makefile.in 2011-04-03 18:10:46.000000000 -0400
++++ avahi-0.6.30-new/avahi-ui/Makefile.in 2011-07-26 20:05:56.000000000
-0400
+@@ -142,9 +142,7 @@
+ $(libavahi_ui_gtk3_la_LDFLAGS) $(LDFLAGS) -o $@
+
@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@am_libavahi_ui_gtk3_la_rpath
= -rpath \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@
$(libdir)
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_DEPENDENCIES
= ../avahi-common/libavahi-common.la \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@
../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@
../avahi-glib/libavahi-glib.la \
++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_DEPENDENCIES
= \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_1) \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__DEPENDENCIES_1)
am__libavahi_ui_la_SOURCES_DIST = avahi-ui.h avahi-ui.c \
-@@ -119,8 +117,6 @@
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@am_bssh_OBJECTS =
bssh-bssh.$(OBJEXT)
+@@ -166,8 +164,6 @@
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@am_bssh_OBJECTS =
bssh-bssh.$(OBJEXT)
bssh_OBJECTS = $(am_bssh_OBJECTS)
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bssh_DEPENDENCIES =
$(am__DEPENDENCIES_1) \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@
../avahi-client/libavahi-client.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@
../avahi-common/libavahi-common.la \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ libavahi-ui.la
- bssh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(bssh_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -406,15 +402,15 @@
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ $(am__append_6)
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LIBADD = \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ $(AM_LDADD) \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@
../avahi-common/libavahi-common.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@
../avahi-client/libavahi-client.la \
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@
../avahi-glib/libavahi-glib.la \
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ -lavahi-common \
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ -lavahi-client \
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ -lavahi-glib \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ $(GTK20_LIBS) \
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@ $(am__append_4)
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@libavahi_ui_la_LDFLAGS =
$(AM_LDFLAGS) -version-info $(LIBAVAHI_UI_VERSION_INFO)
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bssh_SOURCES = bssh.c
- @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bssh_CFLAGS = $(AM_CFLAGS)
$(GTK20_CFLAGS)
--@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bssh_LDADD = $(AM_LDADD)
$(GTK20_LIBS) ../avahi-client/libavahi-client.la
../avahi-common/libavahi-common.la libavahi-ui.la
-+@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK_TRUE@bssh_LDADD = $(AM_LDADD)
$(GTK20_LIBS) -lavahi-client -lavahi-common libavahi-ui.la
+
@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_DEPENDENCIES
= $(am__DEPENDENCIES_1) \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@
../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@
../avahi-common/libavahi-common.la \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@
libavahi-ui.la
+
@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_DEPENDENCIES
= $(am__DEPENDENCIES_1) \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@
../avahi-client/libavahi-client.la \
+@@ -482,9 +478,9 @@
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_5) \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_10)
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_LIBADD =
$(AM_LDADD) \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@
../avahi-common/libavahi-common.la \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@
../avahi-client/libavahi-client.la \
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@
../avahi-glib/libavahi-glib.la \
++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ -lavahi-common \
++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ -lavahi-client \
++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ -lavahi-glib \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(GTK20_LIBS) \
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@ $(am__append_6)
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@libavahi_ui_la_LDFLAGS =
$(AM_LDFLAGS) -version-info $(LIBAVAHI_UI_VERSION_INFO)
+@@ -503,7 +499,7 @@
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@bssh_SOURCES = bssh.c
+
@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_CFLAGS
= $(AM_CFLAGS) $(GTK20_CFLAGS)
+
@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_CFLAGS
= $(AM_CFLAGS) $(GTK30_CFLAGS)
+-@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_LDADD
= $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la
../avahi-common/libavahi-common.la libavahi-ui.la
++@HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_FALSE@bssh_LDADD
= $(AM_LDADD) $(GTK20_LIBS) -lavahi-client -lavahi-common libavahi-ui.la
+ @HAVE_DBUS_TRUE@@HAVE_GLIB_TRUE@@HAVE_GTK2OR3_TRUE@@HAVE_GTK3_TRUE@bssh_LDADD
= $(AM_LDADD) $(GTK30_LIBS) ../avahi-client/libavahi-client.la
../avahi-common/libavahi-common.la libavahi-ui-gtk3.la
CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
all: all-am
-
Index: libavahi-glib1-dev.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/libavahi-glib1-dev.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- libavahi-glib1-dev.info 18 Jul 2011 14:29:36 -0000 1.8
+++ libavahi-glib1-dev.info 27 Jul 2011 00:17:00 -0000 1.9
@@ -1,22 +1,22 @@
Package: libavahi-glib1-dev
-Version: 0.6.25
-Revision: 2
+Version: 0.6.30
+Revision: 1
BuildDepends: <<
expat1,
glib2-dev (>= 2.22.0-1),
intltool40,
- libavahi-common3-dev,
+ libavahi-common3-dev (>= %v-1),
libgettext8-dev,
pkgconfig
<<
Depends: libavahi-glib1-shlibs (= %v-%r)
BuildDependsOnly: true
Source: http://avahi.org/download/avahi-%v.tar.gz
-Source-MD5: a83155a6e29e3988f07e5eea3287b21e
+Source-MD5: e4db89a2a403ff4c47d66ac66fad1f43
PatchScript: perl -pi -e 's/-version-info/-no-undefined -version-info/'
avahi-glib/Makefile.in
SetCFLAGS: -Os
-ConfigureParams: --disable-dependency-tracking --enable-glib --disable-gobject
--disable-qt3 --disable-qt4 --disable-gtk --disable-dbus --enable-expat
--disable-dbm --disable-gdbm --disable-libdaemon --disable-python
--disable-pygtk --disable-python-dbus --disable-mono --disable-monodoc
--disable-doxygen-doc --disable-doxygen-dot --disable-doxygen-html
--with-distro=freebsd --disable-autoipd --disable-static
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
+ConfigureParams: --disable-dependency-tracking --enable-glib --disable-gobject
--disable-qt3 --disable-qt4 --disable-gtk --disable-dbus --disable-dbm
--disable-gdbm --disable-libdaemon --disable-python --disable-pygtk
--disable-python-dbus --disable-mono --disable-monodoc --disable-doxygen-doc
--disable-doxygen-dot --disable-doxygen-html --with-distro=freebsd
--disable-autoipd --disable-static
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
--disable-gtk3
CompileScript: <<
#!/bin/sh -ev
@@ -38,7 +38,6 @@
Package: libavahi-glib1-shlibs
Depends: <<
glib2-shlibs (>= 2.22.0-1),
- libavahi-common3-shlibs (>= 0.6.25-3),
libavahi-common3-shlibs (>= %v-1)
<<
Files: lib/libavahi-glib.1*.dylib
Index: avahi-ui.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/avahi-ui.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- avahi-ui.info 18 Jul 2011 14:29:36 -0000 1.8
+++ avahi-ui.info 27 Jul 2011 00:17:00 -0000 1.9
@@ -1,7 +1,7 @@
Info3: <<
Package: avahi-ui
-Version: 0.6.25
-Revision: 4
+Version: 0.6.30
+Revision: 1
Depends: <<
libavahi-ui0-shlibs (>= %v-1),
atk1-shlibs (>= 1.28.0-1),
@@ -12,7 +12,7 @@
gtk+2-shlibs (>= 2.18.0-1),
libavahi-client3-shlibs (>= %v-1),
libavahi-common3-shlibs (>= %v-1),
- libavahi-core6-shlibs (>= %v-1),
+ libavahi-core7-shlibs (>= %v-1),
libavahi-glib1-shlibs (>= %v-1),
libgettext8-shlibs,
libglade2-shlibs (>= 2.6.4-7),
@@ -34,9 +34,9 @@
glitz,
gtk+2-dev (>= 2.18.0-1),
intltool40,
- libavahi-client3-dev,
- libavahi-common3-dev,
- libavahi-core6-dev,
+ libavahi-client3-dev (>= %v-1),
+ libavahi-common3-dev (>= %v-1),
+ libavahi-core7-dev (>= %v-1),
libavahi-glib1-dev (>= %v-1),
libdaemon (>= 0.11-1),
libgettext8-dev,
@@ -49,16 +49,16 @@
x11-dev
<<
Source: http://avahi.org/download/avahi-%v.tar.gz
-Source-MD5: a83155a6e29e3988f07e5eea3287b21e
+Source-MD5: e4db89a2a403ff4c47d66ac66fad1f43
PatchFile: %n.patch
-PatchFile-MD5: 08747ffdde80bdfd72b473763c499e1a
+PatchFile-MD5: b2fbc5381f3820697e0b8b881b1f8d86
PatchScript: <<
patch -p1 < %{PatchFile}
perl -pi -e 's/-D_XOPEN_SOURCE=\d+//' configure
<<
SetCFLAGS: -Os
-ConfigureParams: --enable-dependency-tracking --enable-glib --enable-gobject
--disable-qt3 --disable-qt4 --enable-gtk --enable-dbus --enable-expat
--disable-dbm --disable-gdbm --enable-libdaemon --disable-python
--disable-pygtk --disable-python-dbus --disable-mono --disable-monodoc
--disable-doxygen-doc --disable-doxygen-dot --disable-doxygen-html
--with-distro=freebsd --disable-autoipd --with-avahi-priv-access-group=network
--disable-static
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+ConfigureParams: --enable-dependency-tracking --enable-glib --enable-gobject
--disable-qt3 --disable-qt4 --enable-gtk --enable-dbus --disable-dbm
--disable-gdbm --enable-libdaemon --disable-python --disable-pygtk
--disable-python-dbus --disable-mono --disable-monodoc --disable-doxygen-doc
--disable-doxygen-dot --disable-doxygen-html --with-distro=freebsd
--disable-autoipd --with-avahi-priv-access-group=network --disable-static
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--disable-gtk3
CompileScript: <<
#!/bin/sh -ev
@@ -131,9 +131,6 @@
DescPort: <<
_XOPEN_SOURCE is bad news...breaks /usr/include/getopt.h
See: http://avahi.org/ticket/156
-
- libavahi-common uses gettext so make sure to link it.
- See: http://avahi.org/ticket/194
<<
DescDetail: <<
Avahi is a system which facilitates service discovery on a local
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
