diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
commit | ca4b95e91b33e5b8f02a063862359ab00c5260d5 (patch) | |
tree | 872d6a54fa0e59e017aa3101880d82f0e54fb70a /libre/cups-libre/cups-avahi-1-config.patch | |
parent | 041ebdb9062909e39f81cca8c491c7f8adeed2a3 (diff) | |
parent | 2ed96c6eb798c762b61a93a8b4cf80220c00ac1f (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/libvirt/PKGBUILD
community/opendkim/opendkim.rc
core/nfs-utils/blkmapd.service
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-qt/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to 'libre/cups-libre/cups-avahi-1-config.patch')
-rw-r--r-- | libre/cups-libre/cups-avahi-1-config.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libre/cups-libre/cups-avahi-1-config.patch b/libre/cups-libre/cups-avahi-1-config.patch index 663eb39df..516e01fa9 100644 --- a/libre/cups-libre/cups-avahi-1-config.patch +++ b/libre/cups-libre/cups-avahi-1-config.patch @@ -1,6 +1,6 @@ -diff -up cups-1.5.0/config.h.in.avahi-1-config cups-1.5.0/config.h.in ---- cups-1.5.0/config.h.in.avahi-1-config 2011-06-16 21:12:16.000000000 +0100 -+++ cups-1.5.0/config.h.in 2011-08-05 15:04:09.535759988 +0100 +diff -up cups-1.5.2/config.h.in.avahi-1-config cups-1.5.2/config.h.in +--- cups-1.5.2/config.h.in.avahi-1-config 2011-06-16 21:12:16.000000000 +0100 ++++ cups-1.5.2/config.h.in 2012-03-14 15:04:51.365347165 +0000 @@ -390,6 +390,13 @@ @@ -15,9 +15,9 @@ diff -up cups-1.5.0/config.h.in.avahi-1-config cups-1.5.0/config.h.in * Do we have <sys/ioctl.h>? */ -diff -up cups-1.5.0/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.0/config-scripts/cups-dnssd.m4 ---- cups-1.5.0/config-scripts/cups-dnssd.m4.avahi-1-config 2011-05-12 06:21:56.000000000 +0100 -+++ cups-1.5.0/config-scripts/cups-dnssd.m4 2011-08-05 15:04:09.525760307 +0100 +diff -up cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.2/config-scripts/cups-dnssd.m4 +--- cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config 2011-05-12 06:21:56.000000000 +0100 ++++ cups-1.5.2/config-scripts/cups-dnssd.m4 2012-03-14 15:04:51.365347165 +0000 @@ -23,6 +23,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn DNSSDLIBS="" DNSSD_BACKEND="" |