Skip to contentSkip to conversation

cups-filters: bump to 1.20.1

PATCH New Olivier Schonken 2 participants 6 messages Mar 8, 2018 – Jun 18, 2018

lore
Share & tools
lore

Olivier Schonken

author
#0 lore raw

PATCH 1/2 cups-filters: bump to 1.20.1

Signed-off-by Olivier Schonken <[email protected]>
---
 package/cups-filters/cups-filters.hash | 2 +-
 package/cups-filters/cups-filters.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/cups-filters/cups-filters.hash +1 -1
index da9d31c998..043252803f 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 95254d7950df4c74d293ed7dfa0b714f51cff329a82da74a4ac976d342bb35ab  cups-filters-1.17.9.tar.gz
+sha256 f7b3853f9567e0213b4e1602bc670a626c3060e2a043e31b6dee21174d5469a5  cups-filters-1.20.1.tar.gz
package/cups-filters/cups-filters.mk +1 -1
index 6d05aa7e31..fd21bff6d4 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CUPS_FILTERS_VERSION = 1.17.9
+CUPS_FILTERS_VERSION = 1.20.1
 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.14.1
author
#1 lore raw

PATCH 2/2 cups-filters: Add patch to remove relative symbolic link from install

On older build systems with old coreutils, using relative symbolic link (ln -r) does not work, and causes failed builds. Workaround is to use normal symbolic link with a relative path. e.g. ../../$(BINDIR)

This fix is dependent on bumping cups-filters version to 1.20.1 because of autotools issue with Makefile.am changes.

Fixes:
http://autobuild.buildroot.net/results/77a6369f3530a2a6a055f7fd664f1ad424274d77

Signed-off-by Olivier Schonken <[email protected]>
---
 ...ce-relative-linking-with-absolute-linking.patch | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 package/cups-filters/0001-Replace-relative-linking-with-absolute-linking.patch
package/cups-filters/0001-Replace-relative-linking-with-absolute-linking.patch new file +46 -0
new file mode 100644
index 0000000000..e4b35cda39
@@ -0,0 +1,46 @@
+From c26b4c3550557442890f2f790d4f8b61a3734c1f Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <[email protected]>
+Date: Thu, 8 Mar 2018 12:32:23 +0200
+Subject: [PATCH] install: don't use ln -r
+
+Oldish enterprise-class distributions have too old versions of
+coreutils, with ln not supporting -r.
+
+So we fake it.
+
+ln -r would create minimalist relative paths, but they are not
+trivial to generate. Instead, we always create paths relative to the
+root, i.e.:
+
+    ln -s -r /usr/bin/foo /usr/sbin/foo
+
+would create:  /usr/sbin/foo -> ../bin/foo
+while we do :  /usr/sbin/foo -> ../../usr/bin/foo
+
+Signed-off-by: Olivier Schonken <[email protected]>
+---
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d959227..b49914a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -998,11 +998,11 @@ install-exec-hook:
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir)
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(pkgbackenddir)
+ if ENABLE_FOOMATIC
+-	$(LN_S) -r -f $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
++	$(LN_S) -f ../..$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
+ endif
+ if ENABLE_DRIVERLESS
+-	$(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
+-	$(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
++	$(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
++	$(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
+ endif
+ if ENABLE_BRAILLE
+ 	$(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl
+-- 
+2.14.1
+
Signature · 1 line
2.14.1
#2 lore raw

PATCH 2/2 cups-filters: Add patch to remove relative symbolic link from install

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Olivier" == Olivier Schonken <[email protected]> writes:

On older build systems with old coreutils, using relative symbolic link (ln -r) does not work, and causes failed builds. Workaround is to use normal symbolic link with a relative path. e.g. ../../$(BINDIR)

Quoted 7 lines

This fix is dependent on bumping cups-filters version to 1.20.1 because of autotools issue with Makefile.am changes.

Fixes:
http://autobuild.buildroot.net/results/77a6369f3530a2a6a055f7fd664f1ad424274d77

Signed-off-by Olivier Schonken <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/2 cups-filters: Add patch to remove relative symbolic link from install

In reply to Olivier Schonken
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Olivier" == Olivier Schonken <[email protected]> writes:

On older build systems with old coreutils, using relative symbolic link (ln -r) does not work, and causes failed builds. Workaround is to use normal symbolic link with a relative path. e.g. ../../$(BINDIR)

Quoted 7 lines

This fix is dependent on bumping cups-filters version to 1.20.1 because of autotools issue with Makefile.am changes.

Fixes:
http://autobuild.buildroot.net/results/77a6369f3530a2a6a055f7fd664f1ad424274d77

Signed-off-by Olivier Schonken <[email protected]>

Committed to 2018.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard