summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-02-19 21:37:17 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-21 22:05:34 +0000
commitd078caeb0eacbd53ff927f87bb943f667f8fa5c4 (patch)
treef20de90226acf94ce6cac9f51b2459e2f270e5ea /meta/recipes-extended
parentaba8f4a5a59294086d4b61eae4ab16401f5da6cc (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-extended/cups/cups.inc1
-rw-r--r--meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch34
-rw-r--r--meta/recipes-extended/cups/cups_2.0.1.bb6
-rw-r--r--meta/recipes-extended/cups/cups_2.0.2.bb6
4 files changed, 6 insertions, 41 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index cfcd19c0f1..df47c81d59 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -10,7 +10,6 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \
10 file://cups.socket \ 10 file://cups.socket \
11 file://cups.path \ 11 file://cups.path \
12 file://cups.service \ 12 file://cups.service \
13 file://0001-test-ippserver.c-check-avahi-before-use.patch \
14 " 13 "
15 14
16LEAD_SONAME = "libcupsdriver.so" 15LEAD_SONAME = "libcupsdriver.so"
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 @@
1From fba92768324e76fa60d9c5f709e045bd4f7aee89 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sat, 3 Jan 2015 05:56:24 +0000
4Subject: [PATCH] test/ippserver.c: check avahi before use it
5
6Fixed the error when --disable-avahi:
7ippserver.c:425:8: error: unknown type name 'AvahiThreadedPoll'
8
9The avahi is optional, we need check whether it is enabled before use as
10other code does.
11
12Upstream-Status: Pending
13
14Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15---
16 test/ippserver.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/test/ippserver.c b/test/ippserver.c
20index 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--
332.0.1
34
diff --git a/meta/recipes-extended/cups/cups_2.0.1.bb b/meta/recipes-extended/cups/cups_2.0.1.bb
deleted file mode 100644
index c78b44d71f..0000000000
--- a/meta/recipes-extended/cups/cups_2.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require cups.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6c5a350596fba02754bd96eb6df3afd0"
4
5SRC_URI[md5sum] = "7f7c33071035fb20d0879929a42da711"
6SRC_URI[sha256sum] = "60f7f2cca69f3b761a029fb314ee4299e3ea0fc02350f06d192cf31d58215525"
diff --git a/meta/recipes-extended/cups/cups_2.0.2.bb b/meta/recipes-extended/cups/cups_2.0.2.bb
new file mode 100644
index 0000000000..96c24cdcbf
--- /dev/null
+++ b/meta/recipes-extended/cups/cups_2.0.2.bb
@@ -0,0 +1,6 @@
1require cups.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6c5a350596fba02754bd96eb6df3afd0"
4
5SRC_URI[md5sum] = "6e0ea72dbafcf5baaa1cf4178e71096d"
6SRC_URI[sha256sum] = "858720f76b66fd0441ae2a16f7cabd9554c8c64607e28ffacf16c36c53a3b18b"