jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cups: update to 1.6.1.

Browse source
This commit is contained in:
Juan RP 2012-07-28 09:52:10 +02:00
parent 30e26c0f20
commit bc5d118e1c
4 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
srcpkgs/cups/patches/cups-1.4.4-nostrip.patch Normal file
View file

@ -0,0 +1,14 @@
# Source: Gentoo
diff -urN cups-1.4.4/config-scripts/cups-compiler.m4 cups-1.4.4.new/config-scripts/cups-compiler.m4
--- cups-1.4.4/config-scripts/cups-compiler.m4 2009-05-17 02:13:47.000000000 +0200
+++ cups-1.4.4.new/config-scripts/cups-compiler.m4 2010-08-12 19:19:45.937020635 +0200
@@ -30,7 +30,7 @@
if test x$enable_debug = xyes; then
OPTIM="-g"
else
- INSTALL_STRIP="-s"
+ INSTALL_STRIP=""
fi
dnl Debug printfs can slow things down, so provide a separate option for that

25
srcpkgs/cups/patches/cups-1.6.0-fix-install-perms.patch Normal file
View file

@ -0,0 +1,25 @@
Index: Makedefs.in
===================================================================
--- cups-1.5.0/Makedefs.in (Revision 10520)
+++ cups-1.5.0/Makedefs.in (Arbeitskopie)
@@ -40,14 +40,14 @@
# Installation programs...
#
-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@
INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
-INSTALL_DATA = $(INSTALL) -c -m 444
+INSTALL_DATA = $(INSTALL) -c -m 644
INSTALL_DIR = $(INSTALL) -d
-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-INSTALL_MAN = $(INSTALL) -c -m 444
-INSTALL_SCRIPT = $(INSTALL) -c -m 555
+INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+INSTALL_MAN = $(INSTALL) -c -m 644
+INSTALL_SCRIPT = $(INSTALL) -c -m 755
#
# Default user, group, and system groups for the scheduler...

4
srcpkgs/cups/patches/cups-systemd-socket.patch
View file

@ -103,7 +103,7 @@ diff -up cups-1.5.0/data/cups.path.in.systemd-socket cups-1.5.0/data/cups.path.i
diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.service.in diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.service.in
--- cups-1.5.0/data/cups.service.in.systemd-socket 2011-10-18 15:32:40.846670473 +0100 --- cups-1.5.0/data/cups.service.in.systemd-socket 2011-10-18 15:32:40.846670473 +0100
+++ cups-1.5.0/data/cups.service.in 2011-10-18 15:32:40.846670473 +0100 +++ cups-1.5.0/data/cups.service.in 2011-10-18 15:32:40.846670473 +0100
@@ -0,0 +1,9 @@ @@ -0,0 +1,10 @@
+[Unit] +[Unit]
+Description=CUPS Printing Service +Description=CUPS Printing Service
+ +
@ -117,7 +117,7 @@ diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.ser
diff -up cups-1.5.0/data/cups.socket.in.systemd-socket cups-1.5.0/data/cups.socket.in diff -up cups-1.5.0/data/cups.socket.in.systemd-socket cups-1.5.0/data/cups.socket.in
--- cups-1.5.0/data/cups.socket.in.systemd-socket 2011-10-18 15:32:40.847670454 +0100 --- cups-1.5.0/data/cups.socket.in.systemd-socket 2011-10-18 15:32:40.847670454 +0100
+++ cups-1.5.0/data/cups.socket.in 2011-10-18 15:32:40.847670454 +0100 +++ cups-1.5.0/data/cups.socket.in 2011-10-18 15:32:40.847670454 +0100
@@ -0,0 +1,10 @@ @@ -0,0 +1,11 @@
+[Unit] +[Unit]
+Description=CUPS Printing Service Sockets +Description=CUPS Printing Service Sockets
+ +

4
srcpkgs/cups/template
View file

@ -1,6 +1,6 @@
# Template file for 'cups' # Template file for 'cups'
pkgname=cups pkgname=cups
version=1.6.0 version=1.6.1
revision=1 revision=1
patch_args="-Np1" patch_args="-Np1"
depends="libcups>=${version}_${revision} cups-filters bc" depends="libcups>=${version}_${revision} cups-filters bc"
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.cups.org/" homepage="http://www.cups.org/"
license="GPL-2" license="GPL-2"
distfiles="ftp://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2" distfiles="ftp://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"
checksum=9a30b141e3a11e558753a729d9766f487d31fc26f1bc060f8bb7b93d436b86a8 checksum=5842ab1144e653160fe667ee78b932ee036b054c0c2d20533d19e309149a7790
long_desc=" long_desc="
The Common UNIX Printing System (or CUPS(tm)) is a printing system and general The Common UNIX Printing System (or CUPS(tm)) is a printing system and general
replacement for lpd and the like. It supports the Internet Printing Protocol replacement for lpd and the like. It supports the Internet Printing Protocol