[oe-commits] Robert Yang : cups: 2.0.1 -> 2.0.2

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 932a474b465be834bb9ea79b7f5b6fcb62085c22
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=932a474b465be834bb9ea79b7f5b6fcb62085c22

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Thu Feb 19 21:37:17 2015 -0800

cups: 2.0.1 -> 2.0.2

Removed the patch since upstream has fixed it:
0001-test-ippserver.c-check-avahi-before-use.patch

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-extended/cups/cups.inc                |  1 -
 ...1-test-ippserver.c-check-avahi-before-use.patch | 34 ----------------------
 meta/recipes-extended/cups/cups_2.0.1.bb           |  6 ----
 meta/recipes-extended/cups/cups_2.0.2.bb           |  6 ++++
 4 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index cfcd19c..df47c81 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 \
            file://cups.socket \
            file://cups.path \
            file://cups.service \
-           file://0001-test-ippserver.c-check-avahi-before-use.patch \
 	  "
 
 LEAD_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 4bcff69..0000000
--- a/meta/recipes-extended/cups/cups/0001-test-ippserver.c-check-avahi-before-use.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fba92768324e76fa60d9c5f709e045bd4f7aee89 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang at windriver.com>
-Date: Sat, 3 Jan 2015 05:56:24 +0000
-Subject: [PATCH] test/ippserver.c: check avahi before use it
-
-Fixed the error when --disable-avahi:
-ippserver.c:425:8: error: unknown type name 'AvahiThreadedPoll'
-
-The avahi is optional, we need check whether it is enabled before use as
-other code does.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
----
- test/ippserver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/ippserver.c b/test/ippserver.c
-index c785e5f..26c8a66 100644
---- a/test/ippserver.c
-+++ b/test/ippserver.c
-@@ -421,7 +421,7 @@ static int		valid_job_attributes(_ipp_client_t *client);
- 
- #  ifdef HAVE_DNSSD
- static DNSServiceRef	DNSSDMaster = NULL;
--#  else /* HAVE_AVAHI */
-+#  elif defined(HAVE_AVAHI) /* HAVE_AVAHI */
- static AvahiThreadedPoll *DNSSDMaster = NULL;
- static AvahiClient	*DNSSDClient = NULL;
- #  endif /* HAVE_DNSSD */
--- 
-2.0.1
-
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 c78b44d..0000000
--- a/meta/recipes-extended/cups/cups_2.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require cups.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6c5a350596fba02754bd96eb6df3afd0"
-
-SRC_URI[md5sum] = "7f7c33071035fb20d0879929a42da711"
-SRC_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 0000000..96c24cd
--- /dev/null
+++ b/meta/recipes-extended/cups/cups_2.0.2.bb
@@ -0,0 +1,6 @@
+require cups.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6c5a350596fba02754bd96eb6df3afd0"
+
+SRC_URI[md5sum] = "6e0ea72dbafcf5baaa1cf4178e71096d"
+SRC_URI[sha256sum] = "858720f76b66fd0441ae2a16f7cabd9554c8c64607e28ffacf16c36c53a3b18b"