summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2007-12-20 10:39:46 +0000
committerVlastimil Babka <caster@gentoo.org>2007-12-20 10:39:46 +0000
commit15b5004fd53b4952b3a0680d4d687484e5bb9dd7 (patch)
treef2f9f06b0813668743c562bc5ec663efb315e0a6 /app-editors/jedit/files/jedit-4.2-jdk-1.6.patch
parentcheck that cairo is built with USE=svg, bug #202781 (diff)
downloadgentoo-2-15b5004fd53b4952b3a0680d4d687484e5bb9dd7.tar.gz
gentoo-2-15b5004fd53b4952b3a0680d4d687484e5bb9dd7.tar.bz2
gentoo-2-15b5004fd53b4952b3a0680d4d687484e5bb9dd7.zip
Version bump to 4.3pre12 - bug #196961. Fix building of 4.2 with jdk 1.6 - bug #189815, patch by Yoann Pannier <gentoo-bugs@umsar.org>. Remove 4.3pre9.
(Portage version: 2.1.4_rc10)
Diffstat (limited to 'app-editors/jedit/files/jedit-4.2-jdk-1.6.patch')
-rw-r--r--app-editors/jedit/files/jedit-4.2-jdk-1.6.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/app-editors/jedit/files/jedit-4.2-jdk-1.6.patch b/app-editors/jedit/files/jedit-4.2-jdk-1.6.patch
new file mode 100644
index 000000000000..c985289ff258
--- /dev/null
+++ b/app-editors/jedit/files/jedit-4.2-jdk-1.6.patch
@@ -0,0 +1,22 @@
+# correct ambigous references to SplashScreen under jdk-1.6
+
+--- jEdit/org/gjt/sp/jedit/GUIUtilities.java.orig 2007-08-22 11:14:15.000000000 +0200
++++ jEdit/org/gjt/sp/jedit/GUIUtilities.java 2007-08-22 11:15:09.000000000 +0200
+@@ -1516,7 +1516,7 @@
+ //{{{ showSplashScreen() method
+ static void showSplashScreen()
+ {
+- splash = new SplashScreen();
++ splash = new org.gjt.sp.jedit.gui.SplashScreen();
+ } //}}}
+
+ //{{{ advanceSplashProgress() method
+@@ -1529,7 +1529,7 @@
+ //}}}
+
+ //{{{ Private members
+- private static SplashScreen splash;
++ private static org.gjt.sp.jedit.gui.SplashScreen splash;
+ private static Hashtable icons;
+ private static String iconPath = "jeditresource:/org/gjt/sp/jedit/icons/";
+ private static String defaultIconPath = "jeditresource:/org/gjt/sp/jedit/icons/";