package/cups-filters: bump version to 1.25.11
PATCH 1/1 package/cups-filters: bump version to 1.25.11
Removed patch applied upstream:
https://github.com/OpenPrinting/cups-filters/commit/1fa09312860cdee342a0afc9423c9d3c411bbbae
Signed-off-by Bernd Kuhls <[email protected]>
--- ...ild-system-add-missing-ln-srf-script.patch | 71 ------------------- package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 2 +- 3 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 package/cups-filters/0001-Build-system-add-missing-ln-srf-script.patch
package/cups-filters/0001-Build-system-add-missing-ln-srf-script.patch deleted +0 -71
@@ -1,71 +0,0 @@ -From 6f6fb88077bce7f9dd9d21a286eeec700acff04e Mon Sep 17 00:00:00 2001 -From: Carlos Santos <[email protected]> -Date: Mon, 16 Sep 2019 22:22:37 -0300 -Subject: [PATCH] Build system:: add missing ln-srf script - -It is missing in the 1.25.6 release tarball. - -Signed-off-by: Carlos Santos <[email protected]> ---- - ln-srf | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 49 insertions(+) - create mode 100755 ln-srf - -diff --git a/ln-srf b/ln-srf -new file mode 100755 -index 00000000..f395a760 ---- /dev/null -+++ b/ln-srf -@@ -0,0 +1,49 @@ -+#!/bin/sh -+# -+# Author: Carlos Santos <[email protected]> -+# This file is in public domain. -+# -+ -+error() { -+ echo "$@" 1>&2 -+ exit 1 -+} -+ -+src="$1" -+dst="$2" -+ -+check_path() { -+ case "$2" in -+ */../*|*/./*|*/.|*/..) error "$1 path '$2' must be absolute";; -+ */) error "$1 path '$2' must not end with '/'";; -+ /?*) ;; -+ *) error "$1 path '$2' must start with '/'";; -+ esac -+} -+ -+check_path "source" "$src" -+check_path "destination" "$dst" -+ -+# strip leading '/' -+src=${src#/*} -+tmp=${dst#/*} -+ -+s_prefix=${src%%/*} -+d_prefix=${tmp%%/*} -+ -+# strip leading common -+while [ "$s_prefix" = "$d_prefix" ]; do -+ src="${src#$s_prefix/}" -+ tmp="${tmp#$d_prefix/}" -+ s_prefix=${src%%/*} -+ d_prefix=${tmp%%/*} -+done -+ -+s_prefix="../" -+while [ -n "$d_prefix" ] && [ "$tmp" != "$d_prefix" ]; do -+ s_prefix="../$s_prefix" -+ tmp="${tmp#$d_prefix/}" -+ d_prefix=${tmp%%/*} -+done -+ -+ln -s -f "$s_prefix$src" "$dst" --- -2.18.1 -
package/cups-filters/cups-filters.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed: -sha256 d936f1f07a8d79dcb188ba7fdf0800bbe25085c1af875169d45a9615a5ffb6cb cups-filters-1.25.6.tar.gz +sha256 397ba572d32b269ac70827f5c0f77878f857d5ab39de3fd0e801a00663037148 cups-filters-1.25.11.tar.gz sha256 527463af65312372111804589a9624f4c52813e253062ae351e75af5003f317f COPYING
package/cups-filters/cups-filters.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.25.6 +CUPS_FILTERS_VERSION = 1.25.11 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING
Signature · 1 line
2.20.1
PATCH 1/1 package/cups-filters: bump version to 1.25.11
Quoted 10 lines · On Sun, 20 Oct 2019 13:15:25 +0200 Bernd Kuhls <[email protected]> wrote:
Removed patch applied upstream:
https://github.com/OpenPrinting/cups-filters/commit/1fa09312860cdee342a0afc9423c9d3c411bbbaeSigned-off-by Bernd Kuhls <[email protected]>--- ...ild-system-add-missing-ln-srf-script.patch | 71 ------------------- package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 2 +- 3 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 package/cups-filters/0001-Build-system-add-missing-ln-srf-script.patch
You forgot to remove the CUPS_FILTERS_MAKE_LN_SRF_EXECUTABLE post-patch hook, which was no longer needed. Applied after fixing this.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com