diff options
author | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-06-19 00:42:10 -0500 |
---|---|---|
committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-06-19 00:42:10 -0500 |
commit | 6f91efa3e6e85685bbf7a4e07e7cf2324d2388cb (patch) | |
tree | d5cf1b3104dfc411c45a8c1a4a4251a0fbd6818b /0003-AWT-Font-fix-for-Cygwin.patch | |
parent | 40a0a60a27a65867bc1a97def6fe946ac10b091c (diff) | |
download | cygwin-gcc-6f91efa3e6e85685bbf7a4e07e7cf2324d2388cb.tar.gz cygwin-gcc-6f91efa3e6e85685bbf7a4e07e7cf2324d2388cb.tar.xz cygwin-gcc-6f91efa3e6e85685bbf7a4e07e7cf2324d2388cb.zip |
cygwin-gcc 4.9.2-1
Diffstat (limited to '0003-AWT-Font-fix-for-Cygwin.patch')
-rw-r--r-- | 0003-AWT-Font-fix-for-Cygwin.patch | 99 |
1 files changed, 99 insertions, 0 deletions
diff --git a/0003-AWT-Font-fix-for-Cygwin.patch b/0003-AWT-Font-fix-for-Cygwin.patch new file mode 100644 index 0000000..842fc09 --- /dev/null +++ b/0003-AWT-Font-fix-for-Cygwin.patch @@ -0,0 +1,99 @@ +From f4176d1e246a755de7a181169d94cd9676ebb86a Mon Sep 17 00:00:00 2001 +From: Jonathan Yong <10walls@gmail.com> +Date: Thu, 29 May 2014 18:06:00 +0800 +Subject: [PATCH 03/24] AWT Font fix for Cygwin + +--- + .../gnu/classpath/examples/awt/HintingDemo.java | 2 +- + .../gnu/java/awt/peer/ClasspathDesktopPeer.java | 2 +- + .../gnu/java/awt/peer/ClasspathFontPeer.java | 3 +++ + .../resource/gnu/java/awt/font/fonts.properties | 24 +++++++++++----------- + 4 files changed, 17 insertions(+), 14 deletions(-) + +diff --git a/libjava/classpath/examples/gnu/classpath/examples/awt/HintingDemo.java b/libjava/classpath/examples/gnu/classpath/examples/awt/HintingDemo.java +index 5ba44f6..068b596 100644 +--- a/libjava/classpath/examples/gnu/classpath/examples/awt/HintingDemo.java ++++ b/libjava/classpath/examples/gnu/classpath/examples/awt/HintingDemo.java +@@ -211,7 +211,7 @@ public class HintingDemo extends JFrame { + + HintingDemo() + { +- File file = new File("/usr/share/fonts/truetype/freefont/FreeSans.ttf"); ++ File file = new File("/usr/share/fonts/TTF/Vera.ttf"); + loadFont(file); + setLayout(new BorderLayout()); + chooser = new Chooser(); +diff --git a/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java b/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java +index fd4f498..2935a5a 100644 +--- a/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java ++++ b/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java +@@ -58,7 +58,7 @@ public class ClasspathDesktopPeer + implements DesktopPeer + { + /** This is the fallback browser, if no desktop was detected. */ +- protected static final String _DEFAULT_BROWSER = "firefox"; ++ protected static final String _DEFAULT_BROWSER = "xdg-open"; + + /** gnu.java.awt.peer.Desktop.html.command */ + protected static final String _BROWSE = "html"; +diff --git a/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java b/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java +index 96677a4..101a85f 100644 +--- a/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java ++++ b/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java +@@ -158,6 +158,8 @@ public abstract class ClasspathFontPeer + + protected static boolean isLogicalFontName(String name) + { ++ return false; ++/* + String uname = name.toUpperCase (); + return (uname.equals ("SANSSERIF") || + uname.equals ("SERIF") || +@@ -165,6 +167,7 @@ public abstract class ClasspathFontPeer + uname.equals ("DIALOG") || + uname.equals ("DIALOGINPUT") || + uname.equals ("DEFAULT")); ++*/ + } + + protected static String logicalFontNameToFaceName (String name) +diff --git a/libjava/classpath/resource/gnu/java/awt/font/fonts.properties b/libjava/classpath/resource/gnu/java/awt/font/fonts.properties +index 4fc0b10..1370469 100644 +--- a/libjava/classpath/resource/gnu/java/awt/font/fonts.properties ++++ b/libjava/classpath/resource/gnu/java/awt/font/fonts.properties +@@ -36,20 +36,20 @@ + # exception statement from your version. + + # List of available fonts. +-FreeMono/p=/usr/share/fonts/truetype/freefont/FreeMono.ttf +-FreeMono/b=/usr/share/fonts/truetype/freefont/FreeMonoBold.ttf +-FreeMono/bi=/usr/share/fonts/truetype/freefont/FreeMonoBoldOblique.ttf +-FreeMono/i=/usr/share/fonts/truetype/freefont/FreeMonoOblique.ttf ++FreeMono/p=/usr/share/fonts/TTF/VeraMono.ttf ++FreeMono/b=/usr/share/fonts/TTF/VeraMoBd.ttf ++FreeMono/bi=/usr/share/fonts/TTF/VeraMoBI.ttf ++FreeMono/i=/usr/share/fonts/TTF/VeraMoIt.ttf + +-FreeSans/p=/usr/share/fonts/truetype/freefont/FreeSans.ttf +-FreeSans/b=/usr/share/fonts/truetype/freefont/FreeSansBold.ttf +-FreeSans/bi=/usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf +-FreeSans/i=/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf ++FreeSans/p=/usr/share/fonts/TTF/Vera.ttf ++FreeSans/b=/usr/share/fonts/TTF/VeraBd.ttf ++FreeSans/bi=/usr/share/fonts/TTF/VeraBI.ttf ++FreeSans/i=/usr/share/fonts/TTF/VeraIt.ttf + +-FreeSerif/p=/usr/share/fonts/truetype/freefont/FreeSerif.ttf +-FreeSerif/b=/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf +-FreeSerif/bi=/usr/share/fonts/truetype/freefont/FreeSerifBoldOblique.ttf +-FreeSerif/i=/usr/share/fonts/truetype/freefont/FreeSerifOblique.ttf ++FreeSerif/p=/usr/share/fonts/TTF/VeraSe.ttf ++FreeSerif/b=/usr/share/fonts/TTF/VeraSeBd.ttf ++FreeSerif/bi=/usr/share/fonts/TTF/VeraSeBd.ttf ++FreeSerif/i=/usr/share/fonts/TTF/VeraSe.ttf + + # List of aliases. + Dialog/a=FreeSans +-- +2.1.1 + |