From ff7fb5da3a5e89359a93f4209a126a5212871972 Mon Sep 17 00:00:00 2001 From: Rmys Date: Mon, 24 Jun 2019 16:43:00 +0300 Subject: [PATCH 1/2] =?UTF-8?q?cups:rebuild=20emu32=20sat=C4=B1r=20hatalar?= =?UTF-8?q?=C4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hardware/printer/cups/actions.py | 4 +++- hardware/printer/cups/pspec.xml | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/hardware/printer/cups/actions.py b/hardware/printer/cups/actions.py index 999238a709..19c60c3565 100644 --- a/hardware/printer/cups/actions.py +++ b/hardware/printer/cups/actions.py @@ -55,6 +55,7 @@ def setup(): if get.buildTYPE() == "emul32": options += ' \ + --prefix=/usr \ --enable-libusb=no \ --disable-avahi \ --disable-dnssd \ @@ -85,6 +86,7 @@ def install(): #pisitools.remove("/usr/share/cups/data/testprint") pisitools.removeDir("/usr/share/cups/banners") pisitools.dodir("/usr/share/cups/banners") + pisitools.dosed("%s/usr/bin/cups-config-32bit" % get.installDIR(), "bin32", "bin") return autotools.rawInstall("BUILDROOT=%s install-headers install-libs install-data install-exec" % get.installDIR()) @@ -95,4 +97,4 @@ def install(): # Serial backend needs to run as root #shelltools.chmod("%s/usr/lib/cups/backend/serial" % get.installDIR(), 0700) - pisitools.dodoc("LICENSE.txt") + pisitools.dodoc("LICENSE") diff --git a/hardware/printer/cups/pspec.xml b/hardware/printer/cups/pspec.xml index 9ac3f5bb13..45903e40d6 100644 --- a/hardware/printer/cups/pspec.xml +++ b/hardware/printer/cups/pspec.xml @@ -146,6 +146,13 @@ + + 2019-06-24 + 2.2.11 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2019-03-23 2.2.11 From 064b2b40fee1d219b2a8e83746d84dc4125d3799 Mon Sep 17 00:00:00 2001 From: Rmys Date: Mon, 24 Jun 2019 16:45:54 +0300 Subject: [PATCH 2/2] =?UTF-8?q?cups:rebuild=20emu32=20sat=C4=B1r=20hatalar?= =?UTF-8?q?=C4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hardware/printer/cups/actions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/printer/cups/actions.py b/hardware/printer/cups/actions.py index 19c60c3565..8d601079c0 100644 --- a/hardware/printer/cups/actions.py +++ b/hardware/printer/cups/actions.py @@ -97,4 +97,4 @@ def install(): # Serial backend needs to run as root #shelltools.chmod("%s/usr/lib/cups/backend/serial" % get.installDIR(), 0700) - pisitools.dodoc("LICENSE") + pisitools.dodoc("LICENSE.txt")