summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-12-05 16:40:44 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-05 22:30:19 +0000
commit29e20d031fafac83a26bdd8bb9f54091b8d043a2 (patch)
treee943f73112e4a66c0fdb7ce2d7dbe37c3f75d34c /meta/recipes-extended
parentccfeb253c50f8d6438bd67ed3ca042fcdfb4a51c (diff)
downloadpoky-29e20d031fafac83a26bdd8bb9f54091b8d043a2.tar.gz
cups: upgrade to 2.2.9
The following patch is rebased. 0001-don-t-try-to-run-generated-binaries.patch (From OE-Core rev: ee57d79aec06e9b160cf2713636cda650ba68d5a) Signed-off-by: Chen Qi <Qi.Chen@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/0001-don-t-try-to-run-generated-binaries.patch29
-rw-r--r--meta/recipes-extended/cups/cups_2.2.8.bb6
-rw-r--r--meta/recipes-extended/cups/cups_2.2.9.bb6
3 files changed, 21 insertions, 20 deletions
diff --git a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
index db013cf08c..d6a69f2833 100644
--- a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
+++ b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
@@ -1,20 +1,21 @@
1Upstream-Status: Inappropriate [embedded specific] 1From 1fb07162a9ed187cccf06e34c9bf841d15c6e64e Mon Sep 17 00:00:00 2001
2
3From 90069586167b930befce7303aea57078f04b4ed8 Mon Sep 17 00:00:00 2001
4From: Koen Kooi <koen@dominion.thruhere.net> 2From: Koen Kooi <koen@dominion.thruhere.net>
5Date: Sun, 30 Jan 2011 16:37:27 +0100 3Date: Sun, 30 Jan 2011 16:37:27 +0100
6Subject: [PATCH] don't try to run generated binaries 4Subject: [PATCH] don't try to run generated binaries
7 5
6Upstream-Status: Inappropriate [embedded specific]
7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9
9--- 10---
10 ppdc/Makefile | 30 +++++++++++++++--------------- 11 ppdc/Makefile | 32 ++++++++++++++++----------------
11 1 files changed, 15 insertions(+), 15 deletions(-) 12 1 file changed, 16 insertions(+), 16 deletions(-)
12 13
13Index: cups-2.2.6/ppdc/Makefile 14diff --git a/ppdc/Makefile b/ppdc/Makefile
14=================================================================== 15index e563988..973dd3f 100644
15--- cups-2.2.6.orig/ppdc/Makefile 16--- a/ppdc/Makefile
16+++ cups-2.2.6/ppdc/Makefile 17+++ b/ppdc/Makefile
17@@ -228,8 +228,8 @@ genstrings: genstrings.o libcupsppdc.a 18@@ -189,8 +189,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
18 $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ 19 $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
19 libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ 20 libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
20 $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) 21 $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
@@ -25,10 +26,10 @@ Index: cups-2.2.6/ppdc/Makefile
25 26
26 27
27 # 28 #
28@@ -246,9 +246,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu 29@@ -209,9 +209,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
29 $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
30 ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ 30 ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
31 $(COMMONLIBS) $(LIBZ) 31 $(COMMONLIBS) $(LIBZ)
32 $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
32- echo Testing PPD compiler... 33- echo Testing PPD compiler...
33- ./ppdc-static -l en,fr -I ../data foo.drv 34- ./ppdc-static -l en,fr -I ../data foo.drv
34- ./ppdc-static -l en,fr -z -I ../data foo.drv 35- ./ppdc-static -l en,fr -z -I ../data foo.drv
@@ -38,10 +39,10 @@ Index: cups-2.2.6/ppdc/Makefile
38 39
39 40
40 # 41 #
41@@ -274,17 +274,17 @@ ppdi-static: ppdc-static ppdi.o libcups 42@@ -240,17 +240,17 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
42 $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
43 ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ 43 ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
44 $(COMMONLIBS) $(LIBZ) 44 $(COMMONLIBS) $(LIBZ)
45 $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
45- echo Testing PPD importer... 46- echo Testing PPD importer...
46- $(RM) -r ppd ppd2 sample-import.drv 47- $(RM) -r ppd ppd2 sample-import.drv
47- ./ppdc-static -l en -I ../data sample.drv 48- ./ppdc-static -l en -I ../data sample.drv
diff --git a/meta/recipes-extended/cups/cups_2.2.8.bb b/meta/recipes-extended/cups/cups_2.2.8.bb
deleted file mode 100644
index de1bd84bf7..0000000000
--- a/meta/recipes-extended/cups/cups_2.2.8.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require cups.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460"
4
5SRC_URI[md5sum] = "33150d08993a04c8e22176e93805a051"
6SRC_URI[sha256sum] = "3968fc1d26fc48727508db1c1380e36c6694ab90177fd6920aec5f6cc73af9e4"
diff --git a/meta/recipes-extended/cups/cups_2.2.9.bb b/meta/recipes-extended/cups/cups_2.2.9.bb
new file mode 100644
index 0000000000..fcd96ef525
--- /dev/null
+++ b/meta/recipes-extended/cups/cups_2.2.9.bb
@@ -0,0 +1,6 @@
1require cups.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460"
4
5SRC_URI[md5sum] = "798e83bb1a240f5417a252903d83ae0c"
6SRC_URI[sha256sum] = "6d22d5da253b97643320da0bf95574acd85ff2abe3ec1a51d36093841d891156"