diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-02-19 21:37:17 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-21 22:05:34 +0000 |
commit | d078caeb0eacbd53ff927f87bb943f667f8fa5c4 (patch) | |
tree | f20de90226acf94ce6cac9f51b2459e2f270e5ea /meta/recipes-extended/cups/cups | |
parent | aba8f4a5a59294086d4b61eae4ab16401f5da6cc (diff) | |
download | poky-d078caeb0eacbd53ff927f87bb943f667f8fa5c4.tar.gz |
cups: 2.0.1 -> 2.0.2
Removed the patch since upstream has fixed it:
0001-test-ippserver.c-check-avahi-before-use.patch
(From OE-Core rev: e1a8de7d55710199d357c88c22f3f1887d562b61)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/cups/cups')
-rw-r--r-- | meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch b/meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch deleted file mode 100644 index 4bcff69b77..0000000000 --- a/meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From fba92768324e76fa60d9c5f709e045bd4f7aee89 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Sat, 3 Jan 2015 05:56:24 +0000 | ||
4 | Subject: [PATCH] test/ippserver.c: check avahi before use it | ||
5 | |||
6 | Fixed the error when --disable-avahi: | ||
7 | ippserver.c:425:8: error: unknown type name 'AvahiThreadedPoll' | ||
8 | |||
9 | The avahi is optional, we need check whether it is enabled before use as | ||
10 | other code does. | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | --- | ||
16 | test/ippserver.c | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/test/ippserver.c b/test/ippserver.c | ||
20 | index c785e5f..26c8a66 100644 | ||
21 | --- a/test/ippserver.c | ||
22 | +++ b/test/ippserver.c | ||
23 | @@ -421,7 +421,7 @@ static int valid_job_attributes(_ipp_client_t *client); | ||
24 | |||
25 | # ifdef HAVE_DNSSD | ||
26 | static DNSServiceRef DNSSDMaster = NULL; | ||
27 | -# else /* HAVE_AVAHI */ | ||
28 | +# elif defined(HAVE_AVAHI) /* HAVE_AVAHI */ | ||
29 | static AvahiThreadedPoll *DNSSDMaster = NULL; | ||
30 | static AvahiClient *DNSSDClient = NULL; | ||
31 | # endif /* HAVE_DNSSD */ | ||
32 | -- | ||
33 | 2.0.1 | ||
34 | |||