This commit is contained in:
Jakub Jelinek 2010-07-13 21:33:34 +00:00
parent 5f74d245e0
commit 5112141b99
5 changed files with 13 additions and 83 deletions

View File

@ -1,2 +1,2 @@
fastjar-0.97.tar.gz
gcc-4.4.4-20100707.tar.bz2
gcc-4.4.4-20100713.tar.bz2

View File

@ -1,9 +1,9 @@
%global DATE 20100707
%global SVNREV 161902
%global DATE 20100713
%global SVNREV 162154
%global gcc_version 4.4.4
# Note, gcc_release must be integer, if you want to add suffixes to
# %{release}, append them after %{gcc_release} on Release: line.
%global gcc_release 11
%global gcc_release 12
%global _unpackaged_files_terminate_build 0
%global multilib_64_archs sparc64 ppc64 s390x x86_64
%if 0%{?fedora} >= 13 || 0%{?rhel} >= 6
@ -176,7 +176,6 @@ Patch16: gcc44-ppc64-aixdesc.patch
Patch17: gcc44-no-add-needed.patch
Patch18: gcc44-pr44542.patch
Patch19: gcc44-rh610785.patch
Patch20: gcc44-rh578382.patch
Patch1000: fastjar-0.97-segfault.patch
Patch1001: fastjar-0.97-len1.patch
@ -517,7 +516,6 @@ GNAT is a GNU Ada 95 front-end to GCC. This package includes static libraries.
%endif
%patch18 -p0 -b .pr44542~
%patch19 -p0 -b .rh610785~
%patch20 -p0 -b .rh578382~
# This testcase doesn't compile.
rm libjava/testsuite/libjava.lang/PR35020*
@ -2004,6 +2002,13 @@ fi
%endif
%changelog
* Tue Jul 13 2010 Jakub Jelinek <jakub@redhat.com> 4.4.4-12
- update from gcc-4_4-branch
- PRs fortran/44582, fortran/44773, fortran/44847, pch/14940, target/33743
- fix inline-asm check for auto-inc-dec operands (PR testsuite/44701)
- use DW_OP_const[48]u instead of DW_OP_addr for DW_OP_GNU_push_tls_address
operand
* Wed Jul 7 2010 Jakub Jelinek <jakub@redhat.com> 4.4.4-11
- update from gcc-4_4-branch
- PRs target/44597, target/44705

View File

@ -1,76 +0,0 @@
2010-04-27 Andrew Haley <aph@redhat.com>
* gnu/javax/print/ipp/IppResponse.java (parseAttributes): Handle
IppValueTag.UNKNOWN.
* gnu/javax/print/ipp/IppRequest.java (writeOperationAttributes):
Handle RequestedAttributes.
* gnu/javax/print/ipp/IppPrintService.java (processResponse): Add
DocFlavor.SERVICE_FORMATTED.PAGEABLE and
DocFlavor.SERVICE_FORMATTED.PRINTABLE.
--- libjava/classpath/gnu/javax/print/ipp/IppRequest.java (revision 158788)
+++ libjava/classpath/gnu/javax/print/ipp/IppRequest.java (revision 158789)
@@ -434,6 +434,8 @@ public class IppRequest
PrinterURI printerUri = (PrinterURI) attributes.get(PrinterURI.class);
JobUri jobUri = (JobUri) attributes.get(JobUri.class);
JobId jobId = (JobId) attributes.get(JobId.class);
+ RequestedAttributes reqAttrs
+ = (RequestedAttributes)attributes.get(RequestedAttributes.class);
if (printerUri != null && jobId == null && jobUri == null)
{
write(printerUri);
@@ -467,6 +469,12 @@ public class IppRequest
logger.log(Component.IPP, "Attribute: Name: <" + jobUri.getCategory()
.getName() + "> Value: <" + jobUri.toString() + ">");
}
+ else if (reqAttrs != null)
+ {
+ write(reqAttrs);
+ attributes.remove(RequestedAttributes.class);
+ logger.log(Component.IPP, "RequestedAttributes: <" + reqAttrs + ">");
+ }
else
{
throw new IppException("Unknown target operation attribute combination.");
--- libjava/classpath/gnu/javax/print/ipp/IppPrintService.java (revision 158788)
+++ libjava/classpath/gnu/javax/print/ipp/IppPrintService.java (revision 158789)
@@ -356,8 +356,17 @@ public class IppPrintService implements
// should not happen, all fields are public
}
}
+
+ if (this.getClass()
+ .isAssignableFrom(gnu.javax.print.CupsPrintService.class))
+ {
+// CUPS always provides filters to convert from Postscript.
+// This logic looks odd, but it's what OpenJDK does.
+ flavors.add(DocFlavor.SERVICE_FORMATTED.PAGEABLE);
+ flavors.add(DocFlavor.SERVICE_FORMATTED.PRINTABLE);
+ }
}
-
+
// printer uris
Set uris = getPrinterAttributeSet(PrinterUriSupported.class);
printerUris = new ArrayList(uris.size());
--- libjava/classpath/gnu/javax/print/ipp/IppResponse.java (revision 158788)
+++ libjava/classpath/gnu/javax/print/ipp/IppResponse.java (revision 158789)
@@ -302,11 +302,14 @@ public class IppResponse
// out-of-band values
case IppValueTag.UNSUPPORTED:
case IppValueTag.UNKNOWN:
- case IppValueTag.NO_VALUE:
// TODO implement out-of-band handling
- // We currently throw an exception to see when it occurs - not yet :-)
- throw new IppException(
- "Unexpected name value for out-of-band value tag");
+ // We currently throw an exception to see when it occurs - not yet :-)
+ throw new IppException(
+ "Unexpected name value for out-of-band value tag " + tag);
+ case IppValueTag.NO_VALUE:
+ attribute = null;
+
+ break;
case IppValueTag.INTEGER:
int intValue = IppUtilities.convertToInt(value);
attribute = IppUtilities.getIntegerAttribute(name, intValue);

View File

@ -29,3 +29,4 @@ gcc-4_4_4-8_fc13:F-13:gcc-4.4.4-8.fc13.src.rpm:1276244305
gcc-4_4_4-9_fc13:F-13:gcc-4.4.4-9.fc13.src.rpm:1277410568
gcc-4_4_4-10_fc13:F-13:gcc-4.4.4-10.fc13.src.rpm:1277882765
gcc-4_4_4-11_fc13:F-13:gcc-4.4.4-11.fc13.src.rpm:1278497746
gcc-4_4_4-12_fc13:F-13:gcc-4.4.4-12.fc13.src.rpm:1279056750

View File

@ -1,2 +1,2 @@
2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz
ccea98dc838ad0ce98ee1a52ee2931cd gcc-4.4.4-20100707.tar.bz2
cde3a182cf99c529597bdc2bf50073c4 gcc-4.4.4-20100713.tar.bz2