Fixing a minor compilation problem, bug #216608.

Package-Manager: portage-2.1.4.4

5 files changed, 44 insertions, 6 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/Manifest b/media-gfx/sane-backends/Manifest
index a8d7716a4a65..06b2eedb9f0b 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,4 +1,5 @@
 AUX broken_coolscan.patch 442 RMD160 9935934fe6963b7da31b544c7f3baa9065c39bab SHA1 2f1bda3b6bb54cae882005eb709cda33cfd17af8 SHA256 87b327a370f4f7e2884a9715dc880362f313611badf978ba1a1dd23f46284c98
+AUX fujitsu_DBG_LEVEL.patch 680 RMD160 ed131cc2269ca0e621b226a34e7a96ed319d0162 SHA1 d7e7022b4ce1a4d07a89013bc566ff573a9445f5 SHA256 b7376d0981dec47d589164151b03cecf4d9855d1b02ed5362c34357847c5376a
 AUX udev-rule-2.patch 1765 RMD160 4b228ec772c3089b73d99068f6f97e71cad75e76 SHA1 15766ab0b3e327e8d6e953579bab52d29338dc7c SHA256 1d2f8c6eef9b6aa3860570443d18d7221eab306a16afa38ec1b2eccf4ff5203a
 AUX udev-rule-3.patch 1767 RMD160 f094008db4a500549e95c7bd61288f33cc768e2a SHA1 c7cd2aa717c3a1c8c7d721918026ca01fc03aae8 SHA256 acefdb250f039a672c3d7169a103d6d2543410d4032430a9597a0655a37d0567
 AUX udev-rule-4.patch 1861 RMD160 eb841e97e2729dd7645df9261178d1f644b20032 SHA1 0d4911e060b683c4ded5eaf016c83f022ac94303 SHA256 d423f5027041c1a8fba0873941ad4fc60bc857b788b4e4bd6896b82942a2ca6c
@@ -16,7 +17,7 @@ EBUILD sane-backends-1.0.18-r3.ebuild 4192 RMD160 edb6d54b0be9c121de1c409438102b
 EBUILD sane-backends-1.0.18-r4.ebuild 4186 RMD160 5b6123a84c3d271713b428cfe73857e506f088bf SHA1 be4b0e64291e52810ecae84bef85cb9d768f2bf9 SHA256 f3e2f8dd008971a46315a01cdb221ca1394e1ce9be84542c9e7f2a12540a0cea
 EBUILD sane-backends-1.0.18-r5.ebuild 4192 RMD160 1ca4aac2f04c7c310c810d4c516198ce4b9d8cef SHA1 d66526539fa70249be236929bd3689da0b61a4cb SHA256 5628a09f292029318ccdc25c27b95c3e824adad62b5dc97150ce2e8d635564e8
 EBUILD sane-backends-1.0.18-r6.ebuild 4371 RMD160 5adc4cb83da1c4f2a5f948e60b711df9fd263bd6 SHA1 4efffebe28b9acb60f88adcfe9d6ba5818e8ff8d SHA256 3c17ae571a2cf4bd82b61e6dfb85fe335fed37bc0602cd4d8df4800c53b0aee5
-EBUILD sane-backends-1.0.19-r1.ebuild 4426 RMD160 5012e1e6abf1743d8ea33008d4bf7c9d3c6b2e6e SHA1 8b05889b4adca3c9a8c3bc38415f0a9ec9299a13 SHA256 6999b4a21d00830434d6a598aa2ecd2677888efd4822582d2f522163a5938911
-EBUILD sane-backends-1.0.19.ebuild 4425 RMD160 241bad954a9b602768ef2d837a61ea717c535c90 SHA1 cef0169c44c08544f2070b2e106ec624d65556e1 SHA256 169efd73d43e4b6d729977570c0ccb7f076f5c7f4bad6cf76075f8119c9fecf4
-MISC ChangeLog 22734 RMD160 817cc0d1abeda4c780ccbefdc320db8c7d8c89ef SHA1 434182276dbd330bf1d9b62047943e47ee09b641 SHA256 0744e3061c2755cde0bdf23201306eea1e3d11132b5f5c6b09606f2798b25e2e
+EBUILD sane-backends-1.0.19-r1.ebuild 4473 RMD160 f1e3483e518c7c6591aba2d05981a352533a00ab SHA1 5deba26c3a82ddc7ed6c3df2a95c162d13e47367 SHA256 342067865ab302319b12dd99e1b62c9d6526c5a1922dcd12f43de814a8e1ae61
+EBUILD sane-backends-1.0.19.ebuild 4471 RMD160 e21be2b77e2e686c69f086ce3618e55177ab92e8 SHA1 0512ec21de7449f9a07839f15b7653e5706718a5 SHA256 d1f8a66dd0fc46dc209150857418ac11033e178d2e56a82333231cccb82134f0
+MISC ChangeLog 22953 RMD160 7c5c52719add80feb513a3536a2e353ac04a8f02 SHA1 d7bb311d9d0184e690f76cb844c8a9bdfad455ac SHA256 9609df4026cd3160fed6eac94bdd1c0a713862de0929ad2ff70ada288eebd159
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
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