[gentoo-commits] gentoo-x86 commit in net-dns/avahi/files: avahi-0.6.22-vncviewer.patch digest-avahi-0.6.22-r1 avahi-0.6.22-gobject.patch

[Sven Wegener (swegener)]

swegener    08/01/03 17:53:11

  Modified:             avahi-0.6.22-vncviewer.patch
  Added:                digest-avahi-0.6.22-r1 avahi-0.6.22-gobject.patch
  Log:
  Adjust gtk-sharp dependency, bug #203610. Add intltool dependency, bug #203369. Add automake patch submitted to upstream, bug #202968.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.2                  net-dns/avahi/files/avahi-0.6.22-vncviewer.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/files/avahi-0.6.22-vncviewer.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/files/avahi-0.6.22-vncviewer.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/files/avahi-0.6.22-vncviewer.patch?r1=1.1&r2=1.2

Index: avahi-0.6.22-vncviewer.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/files/avahi-0.6.22-vncviewer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avahi-0.6.22-vncviewer.patch	18 Dec 2007 13:38:34 -0000	1.1
+++ avahi-0.6.22-vncviewer.patch	3 Jan 2008 17:53:11 -0000	1.2
@@ -1,6 +1,8 @@
-diff -Nur avahi-0.6.22.orig/avahi-ui/bssh.c avahi-0.6.22/avahi-ui/bssh.c
---- avahi-0.6.22.orig/avahi-ui/bssh.c	2007-12-17 15:12:57.000000000 +0000
-+++ avahi-0.6.22/avahi-ui/bssh.c	2007-12-17 16:07:54.021586488 +0000
+xvncviewer is an alternative on debian.
+vncviewer is what the vnc distribution and we use.
+
+--- avahi-0.6.22/avahi-ui/bssh.c
++++ avahi-0.6.22/avahi-ui/bssh.c
 @@ -86,8 +86,8 @@
  
              gtk_widget_destroy(d);



1.1                  net-dns/avahi/files/digest-avahi-0.6.22-r1

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/files/digest-avahi-0.6.22-r1?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/files/digest-avahi-0.6.22-r1?rev=1.1&content-type=text/plain

Index: digest-avahi-0.6.22-r1
===================================================================
MD5 c84b1a8a23126e188426728710414dc8 avahi-0.6.22.tar.gz 1199901
RMD160 fad35f473a9109c8648e43b0f6f547c32b18e32f avahi-0.6.22.tar.gz 1199901
SHA256 9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52 avahi-0.6.22.tar.gz 1199901



1.1                  net-dns/avahi/files/avahi-0.6.22-gobject.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/files/avahi-0.6.22-gobject.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/files/avahi-0.6.22-gobject.patch?rev=1.1&content-type=text/plain

Index: avahi-0.6.22-gobject.patch
===================================================================
build avahi-gobject only when avahi-client is also built

(modified to only patch the makefiles)

Index: trunk/avahi-gobject/Makefile.am
===================================================================
--- trunk/avahi-gobject/Makefile.am	(revision 1669)
+++ trunk/avahi-gobject/Makefile.am	(revision 1670)
@@ -23,6 +23,7 @@
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_GOBJECT
+if HAVE_DBUS
 
 avahigobjectincludedir=$(includedir)/avahi-gobject
 
@@ -109,6 +110,7 @@
 	$< > $@
 
 endif
+endif
 
 indent:
 	indent -brf -nbbo -nbc -ip0 -cs -nbfde -npsl -br -brs -bap -i4 -bs -cdw -ce -npcs -hnl -cli4 -nut -ci8 ga-*.[ch]
Index: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	(revision 1669)
+++ trunk/Makefile.am	(revision 1670)
@@ -112,6 +112,7 @@
 	$(srcdir)/avahi-glib/glib-malloc.h
 
 if HAVE_GOBJECT
+if HAVE_DBUS
 DX_INPUT += \
 	$(srcdir)/avahi-gobject/ga-client.h \
 	$(srcdir)/avahi-gobject/ga-entry-group.h \
@@ -122,6 +123,7 @@
 	$(srcdir)/avahi-gobject/ga-service-resolver.h
 endif
 endif
+endif
 
 if HAVE_DBUS
 DX_INPUT += \



-- 
gentoo-commits@g.o mailing list