Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 14223 - OpenOffice has JDK1.4 patches, not used
Summary: OpenOffice has JDK1.4 patches, not used
Status: RESOLVED INVALID
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All All
: High normal (vote)
Assignee: Seth Chandler
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-01-20 05:02 UTC by Zhen Lin
Modified: 2003-01-20 13:55 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Zhen Lin 2003-01-20 05:02:34 UTC
The portage tree contains JDK1.4 patches for OpenOffice, the ebuild even
mentions that they are available, but they are not used.

It was a trivial thing to do, to add the patches in:
*** /usr/portage/app-office/openoffice/openoffice-1.0.1-r3.ebuild       Mon Jan
20 10:22:59 2003
--- /usr/portage.local/app-office/openoffice/openoffice-1.0.1-r4.ebuild Mon Jan
20 17:08:34 2003
***************
*** 189,194 ****
--- 189,196 ----
  
        einfo "Applying patches..."
        # This allows JDK 1.4.0 to be used (Prez)
+       epatch ${FILESDIR}/${PV}/${PN}-1.0.1-fix-jdk-1.4.0.patch
+ 
        epatch ${FILESDIR}/${PV}/${PN}-1.0.0-configure.patch
  
        # Get OO to build with gcc-3.2's libstdc++.so (Az)

Those patches include 1.4 specific stuff, so we could add conditionals to the
epatch statement. There is one syntactical change that should always be applied:
---
XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java.orig
   2002-12-02 22:59:26.000000000 -0500
+++ XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java
2002-12-02 23:01:49.000000000 -0500
@@ -79,7 +79,7 @@
                Class.forName(className != null
                              ? className
                              : "sun.net.www.protocol." + protocol + ".Handler");
-           return (URLStreamHandler)handlerClass.newInstance();;
+           return (URLStreamHandler)handlerClass.newInstance();
        }
        catch (Exception e) {
            System.err.println(e);

I wonder why the compilers didn't catch that.
Comment 1 Seth Chandler 2003-01-20 13:55:00 UTC
actually, the 1.4 patches are only applied when using a jdk 1.4 compiler...the syntactical 
error doesn't affect 1.3 compilers, so it isn't applied.  The other 1.4 fixes should NEVER 
be applied when using a 1.3 compiler b/c it prototypes functions that aren't available to 
1.3