diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2014-11-19 19:41:40 +0000 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2014-11-19 19:41:40 +0000 |
| commit | 63b2b569749a84f4565aadef52d0672ef216bdcd (patch) | |
| tree | e44bd58965597fd164f167674f60acd5cb90527f /net-print/cups/files | |
| parent | Make calling perl-module_pkg_setup trigger a real warning (diff) | |
| download | gentoo-2-63b2b569749a84f4565aadef52d0672ef216bdcd.tar.gz gentoo-2-63b2b569749a84f4565aadef52d0672ef216bdcd.tar.bz2 gentoo-2-63b2b569749a84f4565aadef52d0672ef216bdcd.zip | |
version bump
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)
Diffstat (limited to 'net-print/cups/files')
| -rw-r--r-- | net-print/cups/files/cups-2.0.1-fix-compilation.patch | 25 | ||||
| -rw-r--r-- | net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch | 59 |
2 files changed, 84 insertions, 0 deletions
diff --git a/net-print/cups/files/cups-2.0.1-fix-compilation.patch b/net-print/cups/files/cups-2.0.1-fix-compilation.patch new file mode 100644 index 000000000000..5828b6801306 --- /dev/null +++ b/net-print/cups/files/cups-2.0.1-fix-compilation.patch @@ -0,0 +1,25 @@ +From 7bb9184b40bea3c4b9f46362642e5d40053a3ae1 Mon Sep 17 00:00:00 2001 +From: Matthias Maier <tamiko@kyomu.43-1.org> +Date: Wed, 19 Nov 2014 18:44:33 +0100 +Subject: [PATCH] fix compilation + +--- + test/ippserver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/ippserver.c b/test/ippserver.c +index c785e5f..1c64668 100644 +--- a/test/ippserver.c ++++ b/test/ippserver.c +@@ -421,7 +421,7 @@ static int valid_job_attributes(_ipp_client_t *client); + + # ifdef HAVE_DNSSD + static DNSServiceRef DNSSDMaster = NULL; +-# else /* HAVE_AVAHI */ ++# elif defined(HAVE_AVAHI) + static AvahiThreadedPoll *DNSSDMaster = NULL; + static AvahiClient *DNSSDClient = NULL; + # endif /* HAVE_DNSSD */ +-- +2.0.4 + diff --git a/net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch b/net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch new file mode 100644 index 000000000000..967856e4ee60 --- /dev/null +++ b/net-print/cups/files/cups-2.0.1-rename-systemd-service-files.patch @@ -0,0 +1,59 @@ +From 33e0d4c8e450fe69b195422c0880aaa96ca9478d Mon Sep 17 00:00:00 2001 +From: Matthias Maier <tamiko@kyomu.43-1.org> +Date: Wed, 19 Nov 2014 18:00:06 +0100 +Subject: [PATCH] change systemd service files to gentoo naming scheme + +--- + scheduler/Makefile | 10 +++++----- + scheduler/org.cups.cupsd.path.in | 2 +- + scheduler/org.cups.cupsd.service.in | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/scheduler/Makefile b/scheduler/Makefile +index 3e0884a..b354420 100644 +--- a/scheduler/Makefile ++++ b/scheduler/Makefile +@@ -203,11 +203,11 @@ install-data: + if test "x$(SYSTEMD_DIR)" != x; then \ + echo Installing systemd configuration files...; \ + $(INSTALL_DIR) $(BUILDROOT)$(SYSTEMD_DIR); \ +- $(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR); \ +- $(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR); \ +- $(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR); \ +- $(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cups-lpd@.service; \ +- $(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR); \ ++ $(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR)/cups.path; \ ++ $(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR)/cups.service; \ ++ $(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups.socket; \ ++ $(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd@.service; \ ++ $(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd.socket; \ + elif test "x$(XINETD)" != x; then \ + echo Installing xinetd configuration file for cups-lpd...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \ +diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in +index 1bccc6f..90c8576 100644 +--- a/scheduler/org.cups.cupsd.path.in ++++ b/scheduler/org.cups.cupsd.path.in +@@ -2,7 +2,7 @@ + Description=CUPS Scheduler + + [Path] +-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd ++PathExists=@CUPS_CACHEDIR@/d* + + [Install] + WantedBy=multi-user.target +diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in +index 0a27c76..7a04248 100644 +--- a/scheduler/org.cups.cupsd.service.in ++++ b/scheduler/org.cups.cupsd.service.in +@@ -7,5 +7,5 @@ ExecStart=@sbindir@/cupsd -l + Type=simple + + [Install] +-Also=org.cups.cupsd.socket org.cups.cupsd.path ++Also=cups.socket cups.path + WantedBy=printer.target +-- +2.0.4 + |