diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch')
-rw-r--r-- | media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch new file mode 100644 index 000000000000..a7c95d991bb4 --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch @@ -0,0 +1,62 @@ +taken from upstream + +From efb04936b8ad3bf313c289a522ae5832e22c1b7e Mon Sep 17 00:00:00 2001 +From: Paul Newall <quandry@ntlworld.com> +Date: Tue, 15 Oct 2013 22:20:15 +0100 +Subject: [PATCH] detection of cups commented out in configure.in it is no + longer used by kodakaio. + +--- + ChangeLog | 4 ++++ + configure.in | 24 ++++++++++++------------ + 2 files changed, 16 insertions(+), 12 deletions(-) + +2013-10-15 Paul Newall <quandry@ntlworld.com> + * configue.in: detection of cups was commented out. Avahi is now used + for autodetection in kodakaio so the detection of cups is no longer required. + +diff --git a/configure.in b/configure.in +index e13888c..4365868 100644 +--- a/configure.in ++++ b/configure.in +@@ -332,17 +332,17 @@ if test -c /dev/urandom ; then + AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?]) + fi + +-dnl added by PN 3/2/12 to detect cups +-$as_echo "checking for cups" +-if test -e /usr/include/cups/cups.h ; then +- AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?]) +- with_cups="yes" +- LIBS="-lcups $LIBS" +-else +- $as_echo "cups.h not found, you may want to install a cups development package" +- $as_echo "in order to autodetect network scanners in kodakaio." +- with_cups="no" +-fi ++dnl added by PN 3/2/12 to detect cups commented out 15/10/13 since avahi is now used instead ++dnl $as_echo "checking for cups" ++dnl if test -e /usr/include/cups/cups.h ; then ++dnl AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?]) ++dnl with_cups="yes" ++dnl LIBS="-lcups $LIBS" ++dnl else ++dnl $as_echo "cups.h not found, you may want to install a cups development package" ++dnl $as_echo "in order to autodetect network scanners in kodakaio." ++dnl with_cups="no" ++dnl fi + + dnl added by llagendijk 12/7/2012 to detect systemd for saned + $as_echo_n "Checking for systemd..." +@@ -816,7 +816,7 @@ fi + echo "IPv6 support: `eval eval echo ${ipv6}`" + echo "Avahi support: `eval eval echo ${enable_avahi}`" + echo "SNMP support: `eval eval echo ${with_snmp}`" +-echo "CUPS support: `eval eval echo ${with_cups}`" ++dnl echo "CUPS support: `eval eval echo ${with_cups}`" commented out 15/10/13 + echo "-> The following backends will be built:" + for backend in ${BACKENDS} ; do + echo $ECHO_N "${backend} " +-- +2.4.4 + |