diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2004-08-30 17:42:19 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2004-08-30 17:42:19 +0000 |
| commit | 4d39a6e805d45018f4a065de1ea31a1249bfafae (patch) | |
| tree | 8be9a5a9b89b535acf003cd40ebe2f7748f1a5a4 /app-editors | |
| parent | Add a patch to include VPL in Quanta (diff) | |
| download | historical-4d39a6e805d45018f4a065de1ea31a1249bfafae.tar.gz historical-4d39a6e805d45018f4a065de1ea31a1249bfafae.tar.bz2 historical-4d39a6e805d45018f4a065de1ea31a1249bfafae.zip | |
added patch for jikes, bug 62122
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/jedit/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/jedit/Manifest | 12 | ||||
| -rw-r--r-- | app-editors/jedit/files/jedit-4.1-jikes-fix.patch | 15 | ||||
| -rw-r--r-- | app-editors/jedit/files/jedit-4.2_pre12.jikes-and-lock-fix.patch | 267 | ||||
| -rw-r--r-- | app-editors/jedit/jedit-4.1-r1.ebuild | 10 |
5 files changed, 36 insertions, 275 deletions
diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog index a9ee2d1b310f..cce21f08d761 100644 --- a/app-editors/jedit/ChangeLog +++ b/app-editors/jedit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/jedit # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.39 2004/08/30 17:08:13 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.40 2004/08/30 17:42:18 axxo Exp $ + + 30 Aug 2004; Thomas Matthijs <axxo@gentoo.org> + +files/jedit-4.1-jikes-fix.patch, + -files/jedit-4.2_pre12.jikes-and-lock-fix.patch, jedit-4.1-r1.ebuild: + added patch for jikes, bug 62122 *jedit-4.2 (30 Aug 2004) diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest index 5eb4d3c7fb35..c457b9a3c1a9 100644 --- a/app-editors/jedit/Manifest +++ b/app-editors/jedit/Manifest @@ -1,19 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 4fe2c18357c7e0901e9d70fb1056dc9e jedit-4.1-r1.ebuild 2150 +MD5 5390252d25b069e2a5821aa1f711a5d4 jedit-4.1-r1.ebuild 2267 MD5 889a02068dbfdd2fe97fd4a2c825b46c jedit-4.2.ebuild 1767 MD5 fd6cc31cfb221879341ae3e8e0b244cc jedit-4.1.ebuild 1862 -MD5 093bc81fe88ea8aa7d9f0d8d1f5c98a5 ChangeLog 5884 +MD5 315332a9f3c6ca83f064843e1c01a91e ChangeLog 6078 MD5 0c1bc759b6cafc454c336cb35fd05550 metadata.xml 257 -MD5 c3d71c0ba59148476f840c60b999c6b6 files/jedit-4.2_pre12.jikes-and-lock-fix.patch 10873 +MD5 c8305f25e0689d0224f1c0f565a92709 files/jedit-4.1-jikes-fix.patch 492 MD5 c29174550ae9f95fc60afd5cbf079f0c files/digest-jedit-4.1 66 MD5 46c44ce1da70402f205102ea5e9ec8b1 files/digest-jedit-4.2 66 MD5 c29174550ae9f95fc60afd5cbf079f0c files/digest-jedit-4.1-r1 66 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (GNU/Linux) -iD8DBQFBM186/rLF9B432nYRAvDqAJ9K5BpImfR2NGfqfUi2Rr+buzsTkACeKg10 -x2LZ2mOQYKOD3SxmnNwGgEs= -=t+9F +iD8DBQFBM2dE/rLF9B432nYRAr5gAJ9W6iBTDFuzRy+Lf9twopzqcuRI1QCfXYxn +3AyqpBw3dMhb/SIWa6SCCB4= +=Pi1/ -----END PGP SIGNATURE----- diff --git a/app-editors/jedit/files/jedit-4.1-jikes-fix.patch b/app-editors/jedit/files/jedit-4.1-jikes-fix.patch new file mode 100644 index 000000000000..01f6ae7fd811 --- /dev/null +++ b/app-editors/jedit/files/jedit-4.1-jikes-fix.patch @@ -0,0 +1,15 @@ +--- OffsetManager.java 2004-08-30 19:34:45.056963472 +0200 ++++ org/gjt/sp/jedit/buffer/OffsetManager.java 2004-08-30 19:35:14.387504552 +0200 +@@ -672,10 +672,10 @@ + //{{{ PosTopHalf class + static class PosTopHalf implements Position + { +- PosBottomHalf bh; ++ org.gjt.sp.jedit.buffer.OffsetManager.PosBottomHalf bh; + + //{{{ PosTopHalf constructor +- PosTopHalf(PosBottomHalf bh) ++ PosTopHalf(org.gjt.sp.jedit.buffer.OffsetManager.PosBottomHalf bh) + { + this.bh = bh; + bh.ref(); diff --git a/app-editors/jedit/files/jedit-4.2_pre12.jikes-and-lock-fix.patch b/app-editors/jedit/files/jedit-4.2_pre12.jikes-and-lock-fix.patch deleted file mode 100644 index 0605970d6a51..000000000000 --- a/app-editors/jedit/files/jedit-4.2_pre12.jikes-and-lock-fix.patch +++ /dev/null @@ -1,267 +0,0 @@ -diff -ur jEdit/jars/QuickNotepad/QuickNotepad.java /home/slava/jEdit/jars/QuickNotepad/QuickNotepad.java ---- jEdit/jars/QuickNotepad/QuickNotepad.java Mon Apr 19 00:24:49 2004 -+++ /home/slava/jEdit/jars/QuickNotepad/QuickNotepad.java Fri Apr 30 16:23:08 2004 -@@ -18,7 +18,7 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * -- * $Id: jedit-4.2_pre12.jikes-and-lock-fix.patch,v 1.1 2004/05/03 03:06:05 anti Exp $ -+ * $Id: jedit-4.2_pre12.jikes-and-lock-fix.patch,v 1.1 2004/05/03 03:06:05 anti Exp $ - */ - - // from Java: -@@ -167,8 +167,8 @@ - try - { - FileWriter out = new FileWriter(filename); -- dos.write(textArea.getText()); -- dos.close(); -+ out.write(textArea.getText()); -+ out.close(); - } - catch (IOException ioe) - { -diff -ur jEdit/modes/progress.xml /home/slava/jEdit/modes/progress.xml ---- jEdit/modes/progress.xml Fri Feb 6 11:22:08 2004 -+++ /home/slava/jEdit/modes/progress.xml Thu Apr 29 11:03:22 2004 -@@ -24,6 +24,8 @@ - <!-- 2004-01-26 PT Generated using Progress program for Progress 9.1D --> - <!-- 2004-02-04 PT Generated using Progress program for Open Edge 10.0A --> - <!-- 2004-02-06 PT Corrected due to validating errors against xmode.dtd --> -+<!-- 2004-02-16 PT Fixed 'or choose of' being reported as invalid. --> -+<!-- 2004-04-29 PT Added some appbuilder constants --> - <!-- ====================================================================== --> - <!-- Special thanks to Gerben and Stephen for their support. --> - <!-- ====================================================================== --> -@@ -877,7 +879,7 @@ - <MARK_FOLLOWING TYPE="INVALID">:REPOSITION-PARENT-RELATION</MARK_FOLLOWING> - - <!-- NON INVALID: Correction for non-invalid keywords --> -- <SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="o" AT_WORD_START="TRUE">on\s+choose</SEQ_REGEXP> -+ <SEQ_REGEXP TYPE="KEYWORD3" HASH_CHAR="c" AT_WORD_START="TRUE">choose\s+of</SEQ_REGEXP> - - <KEYWORDS> - <!-- Keep the following sections in the specified order since --> -@@ -2624,6 +2626,7 @@ - <KEYWORD1>field-group</KEYWORD1> - <KEYWORD1>file-info</KEYWORD1> - <KEYWORD1>form</KEYWORD1> -+ <KEYWORD1>forward</KEYWORD1> - <KEYWORD1>funct</KEYWORD1> - <KEYWORD1>int</KEYWORD1> - <KEYWORD1>info</KEYWORD1> -@@ -3658,62 +3661,80 @@ - - - <!-- COMMENT2 : Preprocessor statements --> -- <COMMENT2>&GLOB</COMMENT2> -- <COMMENT2>&GLOBAL-DEFINE</COMMENT2> -- <COMMENT2>&SCOP</COMMENT2> -- <COMMENT2>&SCOPED-DEFINE</COMMENT2> -- <COMMENT2>&UNDEFINE</COMMENT2> -- <COMMENT2>&ANALYZE-SUSPEND</COMMENT2> -- <COMMENT2>&ANALYZE-RESUME</COMMENT2> -- <COMMENT2>&IF</COMMENT2> -- <COMMENT2>&THEN</COMMENT2> -- <COMMENT2>&ELSE</COMMENT2> -- <COMMENT2>&ELSEIF</COMMENT2> -- <COMMENT2>&ENDIF</COMMENT2> -- <COMMENT2>&INCLUDE</COMMENT2> -- <COMMENT2>&MESSAGE</COMMENT2> -- <COMMENT2>DEFINED</COMMENT2> -- <COMMENT2>&BATCH-MODE</COMMENT2> -- <COMMENT2>&FILE-NAME</COMMENT2> -- <COMMENT2>&LINE-NUMBER</COMMENT2> -- <COMMENT2>&OPSYS</COMMENT2> -- <COMMENT2>&SEQUENCE</COMMENT2> -- <COMMENT2>&WINDOW-SYSTEM</COMMENT2> -- <COMMENT2>&LIST-1</COMMENT2> -- <COMMENT2>&LIST-2</COMMENT2> -- <COMMENT2>&LIST-3</COMMENT2> -- <COMMENT2>&LIST-4</COMMENT2> -- <COMMENT2>&LIST-5</COMMENT2> -- <COMMENT2>&LIST-6</COMMENT2> - <COMMENT2>&ADM-CONTAINER</COMMENT2> - <COMMENT2>&ADM-SUPPORTED-LINKS</COMMENT2> -+ <COMMENT2>&ANALYZE-RESUME</COMMENT2> -+ <COMMENT2>&ANALYZE-SUSPEND</COMMENT2> -+ <COMMENT2>&BATCH-MODE</COMMENT2> - <COMMENT2>&BROWSE-NAME</COMMENT2> - <COMMENT2>&DEFINED</COMMENT2> - <COMMENT2>&DISPLAYED-FIELDS</COMMENT2> - <COMMENT2>&DISPLAYED-OBJECTS</COMMENT2> -- <COMMENT2>&ENABLED-FIELDS</COMMENT2> -+ <COMMENT2>&ELSE</COMMENT2> -+ <COMMENT2>&ELSEIF</COMMENT2> - <COMMENT2>&ENABLED-FIELDS-IN-QUERY</COMMENT2> -+ <COMMENT2>&ENABLED-FIELDS</COMMENT2> - <COMMENT2>&ENABLED-OBJECTS</COMMENT2> -- <COMMENT2>&ENABLED-TABLES</COMMENT2> - <COMMENT2>&ENABLED-TABLES-IN-QUERY</COMMENT2> -+ <COMMENT2>&ENABLED-TABLES</COMMENT2> -+ <COMMENT2>&ENDIF</COMMENT2> - <COMMENT2>&EXTERNAL-TABLES</COMMENT2> -- <COMMENT2>&FIELD-PAIRS</COMMENT2> - <COMMENT2>&FIELD-PAIRS-IN-QUERY</COMMENT2> -+ <COMMENT2>&FIELD-PAIRS</COMMENT2> - <COMMENT2>&FIELDS-IN-QUERY</COMMENT2> -+ <COMMENT2>&FILE-NAME</COMMENT2> - <COMMENT2>&FIRST-EXTERNAL-TABLE</COMMENT2> - <COMMENT2>&FIRST-TABLE-IN-QUERY</COMMENT2> - <COMMENT2>&FRAME-NAME</COMMENT2> -+ <COMMENT2>&GLOB</COMMENT2> -+ <COMMENT2>&GLOBAL-DEFINE</COMMENT2> -+ <COMMENT2>&IF</COMMENT2> -+ <COMMENT2>&INCLUDE</COMMENT2> - <COMMENT2>&INTERNAL-TABLES</COMMENT2> - <COMMENT2>&LAYOUT-VARIABLE</COMMENT2> -+ <COMMENT2>&LINE-NUMBER</COMMENT2> -+ <COMMENT2>&LIST-1</COMMENT2> -+ <COMMENT2>&LIST-2</COMMENT2> -+ <COMMENT2>&LIST-3</COMMENT2> -+ <COMMENT2>&LIST-4</COMMENT2> -+ <COMMENT2>&LIST-5</COMMENT2> -+ <COMMENT2>&LIST-6</COMMENT2> -+ <COMMENT2>&MESSAGE</COMMENT2> - <COMMENT2>&NEW</COMMENT2> - <COMMENT2>&OPEN-BROWSERS-IN-QUERY</COMMENT2> - <COMMENT2>&OPEN-QUERY</COMMENT2> -+ <COMMENT2>&OPSYS</COMMENT2> - <COMMENT2>&PROCEDURE-TYPE</COMMENT2> - <COMMENT2>&QUERY-NAME</COMMENT2> -+ <COMMENT2>&SCOP</COMMENT2> -+ <COMMENT2>&SCOPED-DEFINE</COMMENT2> - <COMMENT2>&SELF-NAME</COMMENT2> -+ <COMMENT2>&SEQUENCE</COMMENT2> - <COMMENT2>&TABLES-IN-QUERY</COMMENT2> -+ <COMMENT2>&THEN</COMMENT2> - <COMMENT2>&UIB_is_Running</COMMENT2> -+ <COMMENT2>&UNDEFINE</COMMENT2> - <COMMENT2>&WINDOW-NAME</COMMENT2> -+ <COMMENT2>&WINDOW-SYSTEM</COMMENT2> -+ <COMMENT2>DEFINED</COMMENT2> -+ <COMMENT2>PROCEDURE-TYPE</COMMENT2> -+ <COMMENT2>_CREATE-WINDOW</COMMENT2> -+ <COMMENT2>_CUSTOM _DEFINITIONS</COMMENT2> -+ <COMMENT2>_CUSTOM _MAIN-BLOCK</COMMENT2> -+ <COMMENT2>_CUSTOM</COMMENT2> -+ <COMMENT2>_DEFINITIONS</COMMENT2> -+ <COMMENT2>_END-PROCEDURE-SETTINGS</COMMENT2> -+ <COMMENT2>_FUNCTION-FORWARD</COMMENT2> -+ <COMMENT2>_FUNCTION</COMMENT2> -+ <COMMENT2>_INCLUDED-LIB</COMMENT2> -+ <COMMENT2>_INLINE</COMMENT2> -+ <COMMENT2>_MAIN-BLOCK</COMMENT2> -+ <COMMENT2>_PROCEDURE-SETTINGS</COMMENT2> -+ <COMMENT2>_PROCEDURE</COMMENT2> -+ <COMMENT2>_UIB-CODE-BLOCK</COMMENT2> -+ <COMMENT2>_UIB-PREPROCESSOR-BLOCK</COMMENT2> -+ <COMMENT2>_VERSION-NUMBER</COMMENT2> -+ <COMMENT2>_XFTR</COMMENT2> - - </KEYWORDS> - </RULES> -diff -ur jEdit/org/gjt/sp/jedit/buffer/KillRing.java /home/slava/jEdit/org/gjt/sp/jedit/buffer/KillRing.java ---- jEdit/org/gjt/sp/jedit/buffer/KillRing.java Tue Apr 20 21:03:33 2004 -+++ /home/slava/jEdit/org/gjt/sp/jedit/buffer/KillRing.java Fri Apr 30 15:54:37 2004 -@@ -166,7 +166,7 @@ - { - out.write("<ENTRY>"); - out.write(MiscUtilities.charsToEntities( -- (String)model.getElementAt(i))); -+ model.getElementAt(i).toString())); - out.write("</ENTRY>"); - out.write(lineSep); - } -@@ -338,7 +338,7 @@ - else - rem = ring[count - index - 1]; - -- return rem.str; -+ return rem; - } - - public int getSize() -diff -ur jEdit/org/gjt/sp/jedit/buffer/UndoManager.java /home/slava/jEdit/org/gjt/sp/jedit/buffer/UndoManager.java ---- jEdit/org/gjt/sp/jedit/buffer/UndoManager.java Wed Jul 23 02:08:54 2003 -+++ /home/slava/jEdit/org/gjt/sp/jedit/buffer/UndoManager.java Fri Apr 30 15:55:28 2004 -@@ -35,7 +35,7 @@ - * called through, implements such protection. - * - * @author Slava Pestov -- * @version $Id: jedit-4.2_pre12.jikes-and-lock-fix.patch,v 1.1 2004/05/03 03:06:05 anti Exp $ -+ * @version $Id: jedit-4.2_pre12.jikes-and-lock-fix.patch,v 1.1 2004/05/03 03:06:05 anti Exp $ - * @since jEdit 4.0pre1 - */ - public class UndoManager -@@ -373,6 +373,12 @@ - if(mgr.redoClearDirty == this) - mgr.buffer.setDirty(false); - return offset; -+ } //}}} -+ -+ //{{{ toString() method -+ public String toString() -+ { -+ return str; - } //}}} - - UndoManager mgr; -diff -ur jEdit/org/gjt/sp/jedit/gui/PasteFromListDialog.java /home/slava/jEdit/org/gjt/sp/jedit/gui/PasteFromListDialog.java ---- jEdit/org/gjt/sp/jedit/gui/PasteFromListDialog.java Fri Jun 20 21:15:05 2003 -+++ /home/slava/jEdit/org/gjt/sp/jedit/gui/PasteFromListDialog.java Fri Apr 30 15:53:24 2004 -@@ -205,7 +205,7 @@ - super.getListCellRendererComponent(list,value,index, - isSelected,cellHasFocus); - -- setText(shorten((String)value)); -+ setText(shorten(value.toString())); - - return this; - } -diff -ur jEdit/org/gjt/sp/jedit/pluginmgr/InstallPanel.java /home/slava/jEdit/org/gjt/sp/jedit/pluginmgr/InstallPanel.java ---- jEdit/org/gjt/sp/jedit/pluginmgr/InstallPanel.java Fri Mar 26 12:16:18 2004 -+++ /home/slava/jEdit/org/gjt/sp/jedit/pluginmgr/InstallPanel.java Sat May 1 16:09:57 2004 -@@ -638,8 +638,8 @@ - - public int compare(Object o1, Object o2) - { -- Entry e1 = (Entry)o1; -- Entry e2 = (Entry)o2; -+ InstallPanel.Entry e1 = (InstallPanel.Entry)o1; -+ InstallPanel.Entry e2 = (InstallPanel.Entry)o2; - - if (type == NAME) - return e1.name.compareToIgnoreCase(e2.name); -@@ -653,7 +653,7 @@ - } - } //}}} - -- //{{{ HeaderMouseHandler() -+ //{{{ HeaderMouseHandler class - class HeaderMouseHandler extends MouseAdapter - { - public void mouseClicked(MouseEvent evt) -diff -ur jEdit/org/gjt/sp/jedit/pluginmgr/ManagePanel.java /home/slava/jEdit/org/gjt/sp/jedit/pluginmgr/ManagePanel.java ---- jEdit/org/gjt/sp/jedit/pluginmgr/ManagePanel.java Sat Nov 15 14:48:16 2003 -+++ /home/slava/jEdit/org/gjt/sp/jedit/pluginmgr/ManagePanel.java Sat May 1 16:08:17 2004 -@@ -627,8 +627,8 @@ - - public int compare(Object o1, Object o2) - { -- Entry e1 = (Entry)o1; -- Entry e2 = (Entry)o2; -+ ManagePanel.Entry e1 = (ManagePanel.Entry)o1; -+ ManagePanel.Entry e2 = (ManagePanel.Entry)o2; - - if (type == NAME) - return compareNames(e1,e2); -@@ -641,7 +641,7 @@ - } - } - -- private int compareNames(Entry e1, Entry e2) -+ private int compareNames(ManagePanel.Entry e1, ManagePanel.Entry e2) - { - String s1, s2; - if(e1.name == null) diff --git a/app-editors/jedit/jedit-4.1-r1.ebuild b/app-editors/jedit/jedit-4.1-r1.ebuild index 6f172c8e9972..7cae31194ac1 100644 --- a/app-editors/jedit/jedit-4.1-r1.ebuild +++ b/app-editors/jedit/jedit-4.1-r1.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.1-r1.ebuild,v 1.1 2004/07/31 18:33:34 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.1-r1.ebuild,v 1.2 2004/08/30 17:42:19 axxo Exp $ MY_PV="41" +inherit eutils + DESCRIPTION="Programmer's editor written in Java" HOMEPAGE="http://www.jedit.org" SRC_URI="mirror://sourceforge/jedit/jedit${MY_PV}source.tar.gz" @@ -20,6 +22,12 @@ DEPEND="${RDEPEND} S="${WORKDIR}/jEdit" +src_unpack() { + unpack ${A} + cd ${S} + use jikes && epatch ${FILESDIR}/${PN}-${PV}-jikes-fix.patch +} + src_compile() { local antflags="dist" |