| 1 |
flameeyes 08/06/09 13:05:16 |
| 2 |
|
| 3 |
Added: gnome-cups-manager-0.31+gcc-4.3.patch |
| 4 |
Log: |
| 5 |
Add patch from upstream to build with GCC 4.3. Thanks to Jose daLuz for reporting and Arun Raghavan for providing the patches. Closes s bug #225501. |
| 6 |
(Portage version: 2.1.5.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-print/gnome-cups-manager/files/gnome-cups-manager-0.31+gcc-4.3.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/gnome-cups-manager/files/gnome-cups-manager-0.31+gcc-4.3.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/gnome-cups-manager/files/gnome-cups-manager-0.31+gcc-4.3.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gnome-cups-manager-0.31+gcc-4.3.patch |
| 15 |
=================================================================== |
| 16 |
Index: gnome-cups-manager-0.31/libgnomecups/snmpkit/snmpkit |
| 17 |
=================================================================== |
| 18 |
--- gnome-cups-manager-0.31.orig/libgnomecups/snmpkit/snmpkit |
| 19 |
+++ gnome-cups-manager-0.31/libgnomecups/snmpkit/snmpkit |
| 20 |
@@ -31,6 +31,7 @@ |
| 21 |
#include <netdb.h> |
| 22 |
#include <pthread.h> |
| 23 |
|
| 24 |
+#include <cstring> |
| 25 |
#include <string> |
| 26 |
#include <list> |
| 27 |
#include <functional> |
| 28 |
Index: gnome-cups-manager-0.31/libgnomecups/snmpkit/structfill.C |
| 29 |
=================================================================== |
| 30 |
--- gnome-cups-manager-0.31.orig/libgnomecups/snmpkit/structfill.C |
| 31 |
+++ gnome-cups-manager-0.31/libgnomecups/snmpkit/structfill.C |
| 32 |
@@ -28,7 +28,8 @@ |
| 33 |
#include <string.h> |
| 34 |
#include <stdlib.h> |
| 35 |
#include <stdio.h> |
| 36 |
-#include <iostream.h> |
| 37 |
+#include <iostream> |
| 38 |
+#include <ios> |
| 39 |
#include <algorithm> |
| 40 |
|
| 41 |
#include "snmpkit" |
| 42 |
@@ -91,22 +92,22 @@ int SNMP_structFiller::fillStruct(OidSeq |
| 43 |
counters or large ints */ |
| 44 |
if(curber->type()==INT_TAG && cur->type==COUNTER_TAG) |
| 45 |
// these errors are minor enough and simple enough to fix |
| 46 |
- cerr << "Warning: Counter returned when Integer expected for " |
| 47 |
+ std::cerr << "Warning: Counter returned when Integer expected for " |
| 48 |
<< cur->oidstr << " Buggy firmware?\n"; |
| 49 |
else if(curber->type()==COUNTER_TAG && cur->type==INT_TAG) |
| 50 |
// these errors are minor enough and simple enough to fix |
| 51 |
- cerr << "Warning: Integer returned when Counter expected for " |
| 52 |
+ std::cerr << "Warning: Integer returned when Counter expected for " |
| 53 |
<< cur->oidstr << " Buggy firmware?\n"; |
| 54 |
else{ |
| 55 |
- ios::fmtflags opts=ios::hex; |
| 56 |
- opts=cerr.flags(opts); |
| 57 |
- cerr << "Warning: Printer returned a value of type 0x" |
| 58 |
+ std::ios::fmtflags opts=std::ios::hex; |
| 59 |
+ opts=std::cerr.flags(opts); |
| 60 |
+ std::cerr << "Warning: Printer returned a value of type 0x" |
| 61 |
<< static_cast<long unsigned int>(curber->type()) |
| 62 |
<< " when a value of 0x" |
| 63 |
<< static_cast<long unsigned int>(cur->type) |
| 64 |
<< " was expected for " << cur->oidstr |
| 65 |
<< " Buggy firmware? Skipping.\n"; |
| 66 |
- cerr.flags(opts); |
| 67 |
+ std::cerr.flags(opts); |
| 68 |
retval=0; |
| 69 |
break; |
| 70 |
} |
| 71 |
@@ -177,7 +178,7 @@ void *SNMP_structFiller::get(void *tobef |
| 72 |
throw SNMPNoResponseException(); |
| 73 |
|
| 74 |
if(!fillStruct(retseq,(unsigned char*)tobefilled)){ |
| 75 |
- cerr << "Warning: printer did not respond with a value for one of the " |
| 76 |
+ std::cerr << "Warning: printer did not respond with a value for one of the " |
| 77 |
<< "OIDs. Buggy firmware?\n"; |
| 78 |
return NULL; |
| 79 |
} |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
-- |
| 84 |
gentoo-commits@l.g.o mailing list |
Archives