[arch-commits] Commit in avahi/trunk (PKGBUILD introspection.patch)

2010-11-19 Thread Gaetan Bisson
Date: Friday, November 19, 2010 @ 13:41:25
  Author: bisson
Revision: 11

upstream bugfix update, one patch down

Modified:
  avahi/trunk/PKGBUILD
Deleted:
  avahi/trunk/introspection.patch

-+
 PKGBUILD|   13 +
 introspection.patch |   18 --
 2 files changed, 5 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-19 17:40:38 UTC (rev 10)
+++ PKGBUILD2010-11-19 18:41:25 UTC (rev 11)
@@ -2,8 +2,8 @@
 # Contributor: Douglas Soares de Andrade doug...@archlinux.org
 
 pkgname=avahi
-pkgver=0.6.27
-pkgrel=7
+pkgver=0.6.28
+pkgrel=1
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
@@ -26,19 +26,16 @@
 options=('!libtool')
 source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz
 avahi-daemon-dbus.patch
-gnome-nettool.png
-introspection.patch)
-sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b'
+gnome-nettool.png)
+sha1sums=('5da3f7da2cff8ddf74f8746e4dcb2524e5047f67'
   '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
-  'cf56387c88aed246b9f435efc182ef44de4d52f3'
-  '999d71add829ab9bb55262855dfe04126ac7975c')
+  'cf56387c88aed246b9f435efc182ef44de4d52f3')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
   patch -Np0 -i ${srcdir}/avahi-daemon-dbus.patch
-  patch -Np1 -i ${srcdir}/introspection.patch
 
   ./configure \
 --prefix=/usr \

Deleted: introspection.patch
===
--- introspection.patch 2010-11-19 17:40:38 UTC (rev 10)
+++ introspection.patch 2010-11-19 18:41:25 UTC (rev 11)
@@ -1,18 +0,0 @@
-diff -aur avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir 
avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir
 avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir   2010-06-27 
02:38:43.018291433 +0200
-+++ avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir 2010-09-30 
16:16:41.26339 +0200
-@@ -1,10 +1,12 @@
- ?xml version=1.0?
--repository version=1.0
-+repository version=1.2
- xmlns=http://www.gtk.org/introspection/core/1.0;
- xmlns:c=http://www.gtk.org/introspection/c/1.0;
- xmlns:glib=http://www.gtk.org/introspection/glib/1.0;
-   namespace name=AvahiCore version=0.6 shared-library=avahi-core
--alias name=IfIndex target=int c:type=AvahiIfIndex/
-+alias name=IfIndex target=int
-+  type name=AvahiIfIndex c:type=AvahiIfIndex/
-+/alias
- enumeration name=Protocol c:type=AvahiProtocol
-   member name=inet
-   value=0



[arch-commits] Commit in avahi/trunk (PKGBUILD introspection.patch)

2010-10-02 Thread Gaetan Bisson
Date: Saturday, October 2, 2010 @ 13:26:53
  Author: bisson
Revision: 92979

revert to old patch with versionned depends

Modified:
  avahi/trunk/PKGBUILD
  avahi/trunk/introspection.patch

-+
 PKGBUILD|4 ++--
 introspection.patch |   12 
 2 files changed, 2 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-02 16:41:37 UTC (rev 92978)
+++ PKGBUILD2010-10-02 17:26:53 UTC (rev 92979)
@@ -17,7 +17,7 @@
 'mono: mono bindings'
 'dbus-python: avahi-discover'
 'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2' 
'gobject-introspection')
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2' 
'gobject-introspection=0.9.10')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
@@ -31,7 +31,7 @@
 sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b'
   '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
   'cf56387c88aed246b9f435efc182ef44de4d52f3'
-  'ff70358eab95ad5b445c1a584d4a889e4474a25d')
+  '999d71add829ab9bb55262855dfe04126ac7975c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}

Modified: introspection.patch
===
--- introspection.patch 2010-10-02 16:41:37 UTC (rev 92978)
+++ introspection.patch 2010-10-02 17:26:53 UTC (rev 92979)
@@ -16,15 +16,3 @@
  enumeration name=Protocol c:type=AvahiProtocol
member name=inet
value=0
-diff -aur avahi-0.6.27/configure.ac avahi-0.6.27-introspection/configure.ac
 avahi-0.6.27/configure.ac  2010-07-13 05:05:05.464755077 +0200
-+++ avahi-0.6.27-introspection/configure.ac2010-09-30 16:17:06.10559 
+0200
-@@ -472,7 +472,7 @@
- #
- # Introspection support.
- #
--GOBJECT_INTROSPECTION_CHECK([0.6.7])
-+GOBJECT_INTROSPECTION_CHECK([0.9.5])
- 
- #
- # Check for Qt 3



[arch-commits] Commit in avahi/trunk (PKGBUILD introspection.patch)

2010-09-30 Thread Gaetan Bisson
Date: Thursday, September 30, 2010 @ 15:59:42
  Author: bisson
Revision: 92762

fixes FS#20999 and introspection.patch build problems

Modified:
  avahi/trunk/PKGBUILD
  avahi/trunk/introspection.patch

-+
 PKGBUILD|6 +++---
 introspection.patch |   15 ++-
 2 files changed, 17 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-30 19:24:56 UTC (rev 92761)
+++ PKGBUILD2010-09-30 19:59:42 UTC (rev 92762)
@@ -3,7 +3,7 @@
 
 pkgname=avahi
 pkgver=0.6.27
-pkgrel=4
+pkgrel=5
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
@@ -31,7 +31,7 @@
 sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b'
   '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
   'cf56387c88aed246b9f435efc182ef44de4d52f3'
-  '9a585c2b851641511705ac9b423311ac650653cc')
+  'ff70358eab95ad5b445c1a584d4a889e4474a25d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -54,7 +54,7 @@
 --with-avahi-priv-access-group=network \
 --with-autoipd-user=avahi \
 --with-autoipd-group=avahi \
---with-systemdsystemunitdir=/usr/share/dbus-1/system-services # See 
FS#20519
+--with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
 
   make
 }

Modified: introspection.patch
===
--- introspection.patch 2010-09-30 19:24:56 UTC (rev 92761)
+++ introspection.patch 2010-09-30 19:59:42 UTC (rev 92762)
@@ -1,5 +1,6 @@
+diff -aur avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir 
avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir
 --- avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir   2010-06-27 
02:38:43.018291433 +0200
-+++ avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir 2010-09-29 
19:08:53.503339092 +0200
 avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir 2010-09-30 
16:16:41.26339 +0200
 @@ -1,10 +1,12 @@
  ?xml version=1.0?
 -repository version=1.0
@@ -15,3 +16,15 @@
  enumeration name=Protocol c:type=AvahiProtocol
member name=inet
value=0
+diff -aur avahi-0.6.27/configure.ac avahi-0.6.27-introspection/configure.ac
+--- avahi-0.6.27/configure.ac  2010-07-13 05:05:05.464755077 +0200
 avahi-0.6.27-introspection/configure.ac2010-09-30 16:17:06.10559 
+0200
+@@ -472,7 +472,7 @@
+ #
+ # Introspection support.
+ #
+-GOBJECT_INTROSPECTION_CHECK([0.6.7])
++GOBJECT_INTROSPECTION_CHECK([0.9.5])
+ 
+ #
+ # Check for Qt 3



[arch-commits] Commit in avahi/trunk (PKGBUILD introspection.patch)

2010-09-29 Thread Jan de Groot
Date: Wednesday, September 29, 2010 @ 13:34:26
  Author: jgc
Revision: 92405

upgpkg: avahi 0.6.27-4
Fix and enable introspection support

Added:
  avahi/trunk/introspection.patch
Modified:
  avahi/trunk/PKGBUILD

-+
 PKGBUILD|   17 ++---
 introspection.patch |   17 +
 2 files changed, 27 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-29 16:42:09 UTC (rev 92404)
+++ PKGBUILD2010-09-29 17:34:26 UTC (rev 92405)
@@ -3,7 +3,7 @@
 
 pkgname=avahi
 pkgver=0.6.27
-pkgrel=3
+pkgrel=4
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
@@ -17,25 +17,28 @@
 'mono: mono bindings'
 'dbus-python: avahi-discover'
 'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2')
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2' 
'gobject-introspection')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
 provides=('howl' 'mdnsresponder')
 replaces=('howl' 'mdnsresponder')
 options=('!libtool')
-source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz;
-'avahi-daemon-dbus.patch'
-'gnome-nettool.png')
+source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz
+avahi-daemon-dbus.patch
+gnome-nettool.png
+introspection.patch)
 sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b'
   '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
-  'cf56387c88aed246b9f435efc182ef44de4d52f3')
+  'cf56387c88aed246b9f435efc182ef44de4d52f3'
+  '9a585c2b851641511705ac9b423311ac650653cc')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-  patch -p0  ../avahi-daemon-dbus.patch
+  patch -Np0 -i ${srcdir}/avahi-daemon-dbus.patch
+  patch -Np1 -i ${srcdir}/introspection.patch
 
   ./configure \
 --prefix=/usr \

Added: introspection.patch
===
--- introspection.patch (rev 0)
+++ introspection.patch 2010-09-29 17:34:26 UTC (rev 92405)
@@ -0,0 +1,17 @@
+--- avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir   2010-06-27 
02:38:43.018291433 +0200
 avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir 2010-09-29 
19:08:53.503339092 +0200
+@@ -1,10 +1,12 @@
+ ?xml version=1.0?
+-repository version=1.0
++repository version=1.2
+ xmlns=http://www.gtk.org/introspection/core/1.0;
+ xmlns:c=http://www.gtk.org/introspection/c/1.0;
+ xmlns:glib=http://www.gtk.org/introspection/glib/1.0;
+   namespace name=AvahiCore version=0.6 shared-library=avahi-core
+-alias name=IfIndex target=int c:type=AvahiIfIndex/
++alias name=IfIndex target=int
++  type name=AvahiIfIndex c:type=AvahiIfIndex/
++/alias
+ enumeration name=Protocol c:type=AvahiProtocol
+   member name=inet
+   value=0