diff options
Diffstat (limited to 'meta-oe/recipes-printing/cups')
10 files changed, 194 insertions, 85 deletions
diff --git a/meta-oe/recipes-printing/cups/cups-filters.inc b/meta-oe/recipes-printing/cups/cups-filters.inc deleted file mode 100644 index c01e2cd49f..0000000000 --- a/meta-oe/recipes-printing/cups/cups-filters.inc +++ /dev/null @@ -1,81 +0,0 @@ -DESCRIPTION = "CUPS backends, filters, and other software" -HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters" - -LICENSE = "GPLv2 & LGPLv2 & MIT & GPLv2+ & GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=516215fd57564996d70327db19b368ff" - -SECTION = "console/utils" - -DEPENDS = "cups glib-2.0 glib-2.0-native dbus dbus-glib lcms ghostscript poppler qpdf libpng" -DEPENDS:class-native = "poppler-native glib-2.0-native dbus-native pkgconfig-native gettext-native libpng-native" - -SRC_URI = "http://openprinting.org/download/cups-filters/cups-filters-${PV}.tar.gz" - -inherit autotools-brokensep gettext pkgconfig - -EXTRA_OECONF += " --enable-ghostscript --disable-ldap \ - --with-pdftops=hybrid --enable-imagefilters \ - --enable-ghostscript --with-gs-path=${bindir}/gs \ - --with-pdftops-path=${bindir}/gs \ - --with-fontdir=${datadir}/fonts --with-rcdir=no \ - --with-cups-rundir=${localstatedir}/run/cups \ - --localstatedir=${localstatedir}/var \ - --with-rcdir=no \ - --without-php" - -EXTRA_OECONF:class-native += " --with-pdftops=pdftops \ - --disable-avahi --disable-ghostscript \ - --disable-ldap \ - --with-png --without-jpeg --without-tiff" - -BBCLASSEXTEND = "native" - -PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg" -PACKAGECONFIG[png] = "--with-png,--without-png,libpng" -PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" - -PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" - -DIRFILES = "1" - -PACKAGES =+ "\ - ${PN}-gst \ - ${PN}-data \ - " - -FILES:${PN}-gst = "\ - ${libexecdir}/cups/filter/gsto* \ - " - -FILES:${PN}-data = "\ - ${datadir}/cups/data \ - " - -FILES:${PN}-dbg += "\ - ${libexecdir}/cups/backend/.debug \ - ${libexecdir}/cups/driver/.debug \ - ${libexecdir}/cups/filter/.debug \ - " - -FILES:${PN} += "\ - ${libexecdir}/cups \ - ${datadir}/ppd/ \ - ${datadir}/cups/charsets \ - ${datadir}/cups/drv \ - ${datadir}/cups/mime \ - ${datadir}/cups/ppdc \ - ${datadir}/cups/banners \ -" - -do_install:append() { - # remove braille dir - rm -rf ${D}${datadir}/cups/braille - - # remove sysroot path contamination from pkgconfig file - sed -i -e 's:${STAGING_DIR_TARGET}::' ${D}/${libdir}/pkgconfig/libcupsfilters.pc -} - -RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-printing/cups/cups-filters/fix-make-race.patch b/meta-oe/recipes-printing/cups/cups-filters/fix-make-race.patch new file mode 100644 index 0000000000..9a4e31c1d2 --- /dev/null +++ b/meta-oe/recipes-printing/cups/cups-filters/fix-make-race.patch @@ -0,0 +1,33 @@ +From 7aba7c690fd84ca1e48d0cb6829410eeb658c594 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Fri, 24 Nov 2023 17:53:49 +0100 +Subject: [PATCH] Fix a Makefile race condition + +utils/driverless-fax script may be written before utils directory was created + +| make[2]: Entering directory '/home/flk/poky/build/tmp/work/corei7-64-poky-linux/cups-filters/2.0.0/build' +| sed \ +| -e "s|\@CUPS_SERVERBIN\@|/usr/libexec/cups|" \ +| ../cups-filters-2.0.0/utils/driverless-fax.in > utils/driverless-fax +| /bin/bash: line 2: utils/driverless-fax: No such file or directory + +Upstream-Status: Pending +--- + Makefile.am | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +--- a/Makefile.am 2023-09-22 18:14:03.000000000 +0200 ++++ b/Makefile.am 2023-11-24 19:09:09.339653936 +0100 +@@ -62,7 +62,7 @@ + # "driverless" utility + # ==================== + utils/driverless-fax: utils/driverless-fax.in Makefile +- sed \ ++ mkdir -p utils && sed \ + -e "s|\@CUPS_SERVERBIN\@|$(CUPS_SERVERBIN)|" \ + $< > $@ + + + + + diff --git a/meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb b/meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb deleted file mode 100644 index 35c4a929b5..0000000000 --- a/meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -include cups-filters.inc - -SRC_URI[md5sum] = "90ebcae31f2eabd802236408646b1dd9" -SRC_URI[sha256sum] = "174a2a5c919bf88c63ced692a2170add6c2cd70ff06c49bcea32e9cf56960492" diff --git a/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb b/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb new file mode 100644 index 0000000000..efcd1aab8a --- /dev/null +++ b/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "CUPS backends, filters, and other software" +HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=6d5b952b53dbe7752199903d082e5f07" + +DEPENDS = "libcupsfilters libppd glib-2.0 poppler" + +SRC_URI = " \ + https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://fix-make-race.patch \ +" +SRC_URI[sha256sum] = "b5152e3dd148ed73835827ac2f219df7cf5808dbf9dbaec2aa0127b44de800d8" + +inherit autotools gettext pkgconfig github-releases + +EXTRA_OECONF += " \ + --enable-imagefilters \ + --enable-ghostscript --with-gs-path=${bindir}/gs \ + --with-fontdir=${datadir}/fonts \ + --localstatedir=${localstatedir} \ +" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" +PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" + +FILES:${PN} += "${datadir}" +FILES:${PN}-dev += "${datadir}/ppdc" + +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "ghostscript" diff --git a/meta-oe/recipes-printing/cups/cups-pk-helper/dont-localize-org.opensuse.CupsPkHelper.Mechanism.service.patch b/meta-oe/recipes-printing/cups/cups-pk-helper/dont-localize-org.opensuse.CupsPkHelper.Mechanism.service.patch new file mode 100644 index 0000000000..371ce01181 --- /dev/null +++ b/meta-oe/recipes-printing/cups/cups-pk-helper/dont-localize-org.opensuse.CupsPkHelper.Mechanism.service.patch @@ -0,0 +1,26 @@ +Upstream-Status: Pending + +--- a/src/meson.build 2023-01-24 09:22:59.874074134 +0100 ++++ b/src/meson.build 2023-01-24 09:27:00.494627305 +0100 +@@ -73,12 +73,12 @@ + + + # Translate and install policy file +-i18n.merge_file ( +- input: 'org.opensuse.cupspkhelper.mechanism.policy.in', +- output: 'org.opensuse.cupspkhelper.mechanism.policy', +- type: 'xml', +- data_dirs: join_paths (meson.source_root (), 'src'), +- po_dir: join_paths (meson.source_root (), 'po'), +- install: true, +- install_dir: join_paths (prefix, datadir, 'polkit-1', 'actions') +-) ++#i18n.merge_file ( ++# input: 'org.opensuse.cupspkhelper.mechanism.policy.in', ++# output: 'org.opensuse.cupspkhelper.mechanism.policy', ++# type: 'xml', ++# data_dirs: join_paths (meson.source_root (), 'src'), ++# po_dir: join_paths (meson.source_root (), 'po'), ++# install: true, ++# install_dir: join_paths (prefix, datadir, 'polkit-1', 'actions') ++#) diff --git a/meta-oe/recipes-printing/cups/cups-pk-helper_0.2.7.bb b/meta-oe/recipes-printing/cups/cups-pk-helper_0.2.7.bb new file mode 100644 index 0000000000..4bf62006f4 --- /dev/null +++ b/meta-oe/recipes-printing/cups/cups-pk-helper_0.2.7.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "CUPS polkit helper" +HOMEPAGE = "https://www.freedesktop.org/software/cups-pk-helper/releases/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "cups polkit glib-2.0" + +inherit meson pkgconfig gettext features_check + +REQUIRED_DISTRO_FEATURES ="polkit" + +SRC_URI = " \ + https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${PV}.tar.xz \ + file://dont-localize-org.opensuse.CupsPkHelper.Mechanism.service.patch \ +" +SRC_URI[sha256sum] = "66070ddb448fe9fcee76aa26be2ede5a80f85563e3a4afd59d2bfd79fbe2e831" + +do_install:append() { + install -d ${D}${datadir}/polkit-1/actions + install -m 644 ${S}/src/org.opensuse.cupspkhelper.mechanism.policy.in ${D}${datadir}/polkit-1/actions/org.opensuse.cupspkhelper.mechanism.policy +} + +FILES:${PN} += "${datadir}" diff --git a/meta-oe/recipes-printing/cups/libcupsfilters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch b/meta-oe/recipes-printing/cups/libcupsfilters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch new file mode 100644 index 0000000000..72bbf10a14 --- /dev/null +++ b/meta-oe/recipes-printing/cups/libcupsfilters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch @@ -0,0 +1,36 @@ +From 104fba23b1c0c67c92777b3165c6dca99558a656 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 6 Feb 2023 18:13:52 -0800 +Subject: [PATCH] use noexcept(false) instead of throw() from c++17 onwards + +C++17 removed dynamic exception specifications [1] +they had been deprecated since C++11, replace +throw(whatever) with noexcept(false). + +[1] https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0003r5.html + +Upstream-Status: Submitted [https://github.com/OpenPrinting/cups-filters/pull/505] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + filter/pdftoraster.cxx | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cupsfilters/pdftoraster.cxx b/cupsfilters/pdftoraster.cxx +index e8af184fb..e91e22459 100755 +@@ -2198,7 +2198,11 @@ + // For compatibility with g++ >= 4.7 compilers _GLIBCXX_THROW + // should be used as a guard, otherwise use traditional definition + #ifndef _GLIBCXX_THROW +-#define _GLIBCXX_THROW throw ++#if __cplusplus < 201703L ++#define _GLIBCXX_THROW throw ++#else ++#define _GLIBCXX_THROW(x) noexcept(false) ++#endif + #endif + + void * operator new(size_t size) _GLIBCXX_THROW (std::bad_alloc) + +-- +2.39.1 + diff --git a/meta-oe/recipes-printing/cups/libcupsfilters_2.0.0.bb b/meta-oe/recipes-printing/cups/libcupsfilters_2.0.0.bb new file mode 100644 index 0000000000..7f7174d940 --- /dev/null +++ b/meta-oe/recipes-printing/cups/libcupsfilters_2.0.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "OpenPrinting libcupsfilters" +HOMEPAGE = "https://github.com/OpenPrinting" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=aab2024bd2a475438a154cd1640c9684" + +DEPENDS = "cups fontconfig libexif dbus lcms qpdf poppler libpng jpeg tiff" + +SRC_URI = " \ + https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch \ +" +SRC_URI[sha256sum] = "542f2bfbc58136a4743c11dc8c86cee03c9aca705612654e36ac34aa0d9aa601" + +inherit autotools gettext pkgconfig github-releases + +FILES:${PN} += "${datadir}" +RDEPENDS:${PN} += "ghostscript" diff --git a/meta-oe/recipes-printing/cups/libppd_2.0.0.bb b/meta-oe/recipes-printing/cups/libppd_2.0.0.bb new file mode 100644 index 0000000000..99b1f6e730 --- /dev/null +++ b/meta-oe/recipes-printing/cups/libppd_2.0.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "OpenPrinting libppd" +HOMEPAGE = "https://github.com/OpenPrinting" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=c1fca671047153ce6825c4ab06f2ab49" + +DEPENDS = "libcupsfilters" + +SRC_URI = "https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz" +SRC_URI[sha256sum] = "882d3c659a336e91559de8f3c76fc26197fe6e5539d9b484a596e29a5a4e0bc8" + +inherit autotools gettext pkgconfig github-releases + +do_install:append() { + rm -r ${D}${bindir} +} + +FILES:${PN} += "${datadir}" + diff --git a/meta-oe/recipes-printing/cups/python3-pycups.bb b/meta-oe/recipes-printing/cups/python3-pycups.bb new file mode 100644 index 0000000000..6968170d93 --- /dev/null +++ b/meta-oe/recipes-printing/cups/python3-pycups.bb @@ -0,0 +1,11 @@ +SUMMARY = "CUPS bindings for Python" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3961efb54421653518521529853444c4" + +RDEPENDS:${PN} = "python3" + +inherit setuptools3 pypi + +PV = "2.0.1" + +SRC_URI[sha256sum] = "e880d7d7147959ead5cb34764f08b97b41385b36eb8256e8af1ce163dbcccce8" |