Author: randy
Date: 2005-11-03 14:34:39 -0700 (Thu, 03 Nov 2005)
New Revision: 1231
Added:
trunk/fop/fop-0.20.5-jdk_1.5.0-1.patch
trunk/php/php-5.0.5-db43-1.patch
Removed:
trunk/fop/fop_0.20.5-jdk_1.5.0-1.patch
Log:
Updated BLFS patches to current SVN
Copied: trunk/fop/fop-0.20.5-jdk_1.5.0-1.patch (from rev 1216,
trunk/fop/fop_0.20.5-jdk_1.5.0-1.patch)
Deleted: trunk/fop/fop_0.20.5-jdk_1.5.0-1.patch
===================================================================
--- trunk/fop/fop_0.20.5-jdk_1.5.0-1.patch 2005-11-03 19:56:06 UTC (rev
1230)
+++ trunk/fop/fop_0.20.5-jdk_1.5.0-1.patch 2005-11-03 21:34:39 UTC (rev
1231)
@@ -1,140 +0,0 @@
-Submitted By: DJ Lucas <dj AT linuxfromscratch DOT org>
-Date: 2005-04-24
-Initial Package Version: 0.20.5
-Upstream Status: From Upstream
-Origin: fop-xml CVS
-Description: Fixes compilation with JDK-1.5.
-
-diff -Naur fop-0.20.5-orig/src/org/apache/fop/fonts/apps/PFMReader.java
fop-0.20.5/src/org/apache/fop/fonts/apps/PFMReader.java
---- fop-0.20.5-orig/src/org/apache/fop/fonts/apps/PFMReader.java
2003-07-14 21:03:25.000000000 -0500
-+++ fop-0.20.5/src/org/apache/fop/fonts/apps/PFMReader.java 2005-04-17
21:40:44.633035168 -0500
-@@ -370,16 +370,16 @@
-
-
- // Get kerning
-- for (Iterator enum = pfm.getKerning().keySet().iterator();
enum.hasNext(); ) {
-- Integer kpx1 = (Integer)enum.next();
-+ for (Iterator iter = pfm.getKerning().keySet().iterator();
iter.hasNext(); ) {
-+ Integer kpx1 = (Integer)iter.next();
- el = doc.createElement("kerning");
- el.setAttribute("kpx1", kpx1.toString());
- root.appendChild(el);
- Element el2 = null;
-
- Map h2 = (Map)pfm.getKerning().get(kpx1);
-- for (Iterator enum2 = h2.keySet().iterator(); enum2.hasNext(); ) {
-- Integer kpx2 = (Integer)enum2.next();
-+ for (Iterator iter2 = h2.keySet().iterator(); iter2.hasNext(); ) {
-+ Integer kpx2 = (Integer)iter2.next();
- el2 = doc.createElement("pair");
- el2.setAttribute("kpx2", kpx2.toString());
- Integer val = (Integer)h2.get(kpx2);
-diff -Naur fop-0.20.5-orig/src/org/apache/fop/fonts/apps/TTFReader.java
fop-0.20.5/src/org/apache/fop/fonts/apps/TTFReader.java
---- fop-0.20.5-orig/src/org/apache/fop/fonts/apps/TTFReader.java
2003-07-14 21:03:13.000000000 -0500
-+++ fop-0.20.5/src/org/apache/fop/fonts/apps/TTFReader.java 2005-04-17
21:40:44.634035016 -0500
-@@ -423,14 +423,14 @@
- }
-
- // Get kerning
-- Iterator enum;
-+ Iterator iter;
- if (isCid)
-- enum = ttf.getKerning().keySet().iterator();
-+ iter = ttf.getKerning().keySet().iterator();
- else
-- enum = ttf.getAnsiKerning().keySet().iterator();
-+ iter = ttf.getAnsiKerning().keySet().iterator();
-
-- while (enum.hasNext()) {
-- Integer kpx1 = (Integer)enum.next();
-+ while (iter.hasNext()) {
-+ Integer kpx1 = (Integer)iter.next();
-
- el = doc.createElement("kerning");
- el.setAttribute("kpx1", kpx1.toString());
-@@ -443,8 +443,8 @@
- else
- h2 = (HashMap)ttf.getAnsiKerning().get(kpx1);
-
-- for (Iterator enum2 = h2.keySet().iterator(); enum2.hasNext(); ) {
-- Integer kpx2 = (Integer)enum2.next();
-+ for (Iterator iter2 = h2.keySet().iterator(); iter2.hasNext(); ) {
-+ Integer kpx2 = (Integer)iter2.next();
- if (isCid || kpx2.intValue() < 256) {
- el2 = doc.createElement("pair");
- el2.setAttribute("kpx2", kpx2.toString());
-diff -Naur fop-0.20.5-orig/src/org/apache/fop/messaging/MessageHandler.java
fop-0.20.5/src/org/apache/fop/messaging/MessageHandler.java
---- fop-0.20.5-orig/src/org/apache/fop/messaging/MessageHandler.java
2003-07-14 21:03:14.000000000 -0500
-+++ fop-0.20.5/src/org/apache/fop/messaging/MessageHandler.java
2005-04-17 21:40:44.639034256 -0500
-@@ -156,9 +156,9 @@
- break;
- case EVENT:
- setMessage(message);
-- Enumeration enum = listeners.elements();
-- while (enum.hasMoreElements()) {
-- ((MessageListener)enum.nextElement()).processMessage(new
MessageEvent(getMessage()));
-+ Enumeration enumer = listeners.elements();
-+ while (enumer.hasMoreElements()) {
-+ ((MessageListener)enumer.nextElement()).processMessage(new
MessageEvent(getMessage()));
- }
- break;
- case NONE:
-@@ -205,11 +205,11 @@
- break;
- case EVENT:
- setMessage(message);
-- Enumeration enum = listeners.elements();
-- while (enum.hasMoreElements()) {
-+ Enumeration enumer = listeners.elements();
-+ while (enumer.hasMoreElements()) {
- MessageEvent messEv = new MessageEvent(getMessage());
- messEv.setMessageType(MessageEvent.ERROR);
-- ((MessageListener)enum.nextElement()).processMessage(messEv);
-+
((MessageListener)enumer.nextElement()).processMessage(messEv);
- }
- break;
- case NONE:
-diff -Naur fop-0.20.5-orig/src/org/apache/fop/render/ps/PSRenderer.java
fop-0.20.5/src/org/apache/fop/render/ps/PSRenderer.java
---- fop-0.20.5-orig/src/org/apache/fop/render/ps/PSRenderer.java
2003-07-14 21:03:16.000000000 -0500
-+++ fop-0.20.5/src/org/apache/fop/render/ps/PSRenderer.java 2005-04-17
21:40:44.640034104 -0500
-@@ -303,9 +303,9 @@
- // write("/gfF1{/Helvetica findfont} bd");
- // write("/gfF3{/Helvetica-Bold findfont} bd");
- Map fonts = fontInfo.getFonts();
-- Iterator enum = fonts.keySet().iterator();
-- while (enum.hasNext()) {
-- String key = (String)enum.next();
-+ Iterator iter = fonts.keySet().iterator();
-+ while (iter.hasNext()) {
-+ String key = (String)iter.next();
- Font fm = (Font)fonts.get(key);
- write("/" + key + " /" + fm.fontName() + " def");
- }
-@@ -314,9 +314,9 @@
- defineWinAnsiEncoding();
-
- //Rewrite font encodings
-- enum = fonts.keySet().iterator();
-- while (enum.hasNext()) {
-- String key = (String)enum.next();
-+ iter = fonts.keySet().iterator();
-+ while (iter.hasNext()) {
-+ String key = (String)iter.next();
- Font fm = (Font)fonts.get(key);
- if (null == fm.encoding()) {
- //ignore (ZapfDingbats and Symbol run through here
-diff -Naur fop-0.20.5-orig/src/org/apache/fop/svg/PDFGraphics2D.java
fop-0.20.5/src/org/apache/fop/svg/PDFGraphics2D.java
---- fop-0.20.5-orig/src/org/apache/fop/svg/PDFGraphics2D.java 2003-07-14
21:03:16.000000000 -0500
-+++ fop-0.20.5/src/org/apache/fop/svg/PDFGraphics2D.java 2005-04-17
21:57:03.000000000 -0500
-@@ -1328,6 +1328,11 @@
- return null;
- }
- @jdk14codeend@
-+
-+ // needed for compiling under jdk1.5
-+ public VolatileImage createCompatibleVolatileImage(int width, int
height, int transparency) {
-+ return null;
-+ }
- }
-
- /**
Added: trunk/php/php-5.0.5-db43-1.patch
===================================================================
--- trunk/php/php-5.0.5-db43-1.patch 2005-11-03 19:56:06 UTC (rev 1230)
+++ trunk/php/php-5.0.5-db43-1.patch 2005-11-03 21:34:39 UTC (rev 1231)
@@ -0,0 +1,21 @@
+Submitted By: Igor Zivkovic <[EMAIL PROTECTED]>
+Date: 2005-01-10
+Initial Package Version: 5.0.3
+Upstream Status: Not submitted.
+Origin: http://www.sleepycat.com/docs/ref/upgrade.4.3/toc.html
+Description: Adds support for Berkeley DB-4.3.x.
+
+$LastChangedBy: igor $
+$Date: 2005-10-16 10:52:15 -0500 (Sun, 16 Oct 2005) $
+
+--- php-5.0.3/ext/dba/dba_db4.c.orig 2005-01-10 00:10:49.798665848 +0000
++++ php-5.0.3/ext/dba/dba_db4.c 2005-01-10 00:23:10.805015760 +0000
+@@ -36,7 +36,7 @@
+ #include <db.h>
+ #endif
+
+-static void php_dba_db4_errcall_fcn(const char *errpfx, char *msg)
++static void php_dba_db4_errcall_fcn(const DB_ENV *dbenv, const char *errpfx,
const char *msg)
+ {
+ TSRMLS_FETCH();
+
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
