diff options
| author |   Patrick Kursawe <phosphan@gentoo.org> | 2008-04-08 08:44:50 +0000 |
|---|---|---|
| committer | Patrick Kursawe <phosphan@gentoo.org> | 2008-04-08 08:44:50 +0000 |
| commit | 5fae75f6cc0f1fde15e0b60297cab33d21e54fc3 (patch) | |
| tree | 123d603a6beeaca521ec75d581101c38b5ebd66a /media-gfx | |
| parent | Removing broken versions (diff) | |
| download | gentoo-2-5fae75f6cc0f1fde15e0b60297cab33d21e54fc3.tar.gz gentoo-2-5fae75f6cc0f1fde15e0b60297cab33d21e54fc3.tar.bz2 gentoo-2-5fae75f6cc0f1fde15e0b60297cab33d21e54fc3.zip | |
Fixing a minor compilation problem, bug #216608.
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/sane-backends/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/sane-backends/files/fujitsu_DBG_LEVEL.patch | 30 | ||||
| -rw-r--r-- | media-gfx/sane-backends/sane-backends-1.0.19-r1.ebuild | 3 | ||||
| -rw-r--r-- | media-gfx/sane-backends/sane-backends-1.0.19.ebuild | 3 |
4 files changed, 40 insertions, 3 deletions
diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog index 200579957963..a4e3ed2c971f 100644 --- a/media-gfx/sane-backends/ChangeLog +++ b/media-gfx/sane-backends/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/sane-backends # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.134 2008/04/07 17:04:29 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.135 2008/04/08 08:44:50 phosphan Exp $ + + 08 Apr 2008; Patrick Kursawe <phosphan@gentoo.org> + +files/fujitsu_DBG_LEVEL.patch, sane-backends-1.0.19.ebuild, + sane-backends-1.0.19-r1.ebuild: + Fixing compilation error when -DNDEBUG is in CFLAGS, bug #216608. 07 Apr 2008; Tobias Klausmann <klausman@gentoo.org> sane-backends-1.0.18-r6.ebuild: diff --git a/media-gfx/sane-backends/files/fujitsu_DBG_LEVEL.patch b/media-gfx/sane-backends/files/fujitsu_DBG_LEVEL.patch new file mode 100644 index 000000000000..32a1153d54c0 --- /dev/null +++ b/media-gfx/sane-backends/files/fujitsu_DBG_LEVEL.patch @@ -0,0 +1,30 @@ +--- backend/fujitsu.c 2008-01-23 02:21:21.000000000 +0100 ++++ backend/fujitsu.c.new 2008-04-08 10:08:09.000000000 +0200 +@@ -1221,7 +1221,6 @@ + init_ms(struct fujitsu *s) + { + int ret; +- int oldDbg=DBG_LEVEL; + unsigned char buffer[1]; + size_t inLen = sizeof(buffer); + +@@ -1232,10 +1231,6 @@ + return SANE_STATUS_GOOD; + } + +- if(DBG_LEVEL < 35){ +- DBG_LEVEL = 0; +- } +- + set_MSEN_xfer_length (mode_senseB.cmd, inLen); + + /* prepick */ +@@ -1391,8 +1386,6 @@ + s->has_MS_jobsep=1; + } + +- DBG_LEVEL = oldDbg; +- + DBG (15, " prepick: %d\n", s->has_MS_prepick); + DBG (15, " sleep: %d\n", s->has_MS_sleep); + DBG (15, " duplex: %d\n", s->has_MS_duplex); diff --git a/media-gfx/sane-backends/sane-backends-1.0.19-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.19-r1.ebuild index dad3bd46f6d0..94a9c000929d 100644 --- a/media-gfx/sane-backends/sane-backends-1.0.19-r1.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.0.19-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19-r1.ebuild,v 1.1 2008/04/04 14:30:06 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19-r1.ebuild,v 1.2 2008/04/08 08:44:50 phosphan Exp $ inherit eutils @@ -103,6 +103,7 @@ src_unpack() { die "could not add 'brother' to backend list" fi epatch "${FILESDIR}"/udev-rule-5.patch + epatch "${FILESDIR}"/fujitsu_DBG_LEVEL.patch cat >> backend/dll.conf.in <<-EOF # Add support for the HP-specific backend. Needs net-print/hplip installed. hpaio diff --git a/media-gfx/sane-backends/sane-backends-1.0.19.ebuild b/media-gfx/sane-backends/sane-backends-1.0.19.ebuild index 5e42774fc38d..2ef9b6110c26 100644 --- a/media-gfx/sane-backends/sane-backends-1.0.19.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.0.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19.ebuild,v 1.1 2008/02/11 10:33:11 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19.ebuild,v 1.2 2008/04/08 08:44:50 phosphan Exp $ inherit eutils @@ -103,6 +103,7 @@ src_unpack() { die "could not add 'brother' to backend list" fi epatch "${FILESDIR}"/udev-rule-5.patch + epatch "${FILESDIR}"/fujitsu_DBG_LEVEL.patch cat >> backend/dll.conf.in <<-EOF # Add support for the HP-specific backend. Needs net-print/hplip installed. #hpaio |