diff options
author | Yaakov Selkowitz <yselkowi@redhat.com> | 2018-06-05 09:11:44 -0500 |
---|---|---|
committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2018-06-05 09:12:23 -0500 |
commit | f8d74197bcb6f3ac0c06a0202cbf600abc4144b6 (patch) | |
tree | e94e087cc4980075c1c6ac1ec20ced0ccceda501 /0003-AWT-Font-fix-for-Cygwin.patch | |
parent | 937525d05cda3a597d1a7ed3962324a12e79bd11 (diff) | |
download | cygwin-gcc-f8d74197bcb6f3ac0c06a0202cbf600abc4144b6.tar.gz cygwin-gcc-f8d74197bcb6f3ac0c06a0202cbf600abc4144b6.tar.xz cygwin-gcc-f8d74197bcb6f3ac0c06a0202cbf600abc4144b6.zip |
Remove GCJ patches
Diffstat (limited to '0003-AWT-Font-fix-for-Cygwin.patch')
-rw-r--r-- | 0003-AWT-Font-fix-for-Cygwin.patch | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/0003-AWT-Font-fix-for-Cygwin.patch b/0003-AWT-Font-fix-for-Cygwin.patch deleted file mode 100644 index e286d87..0000000 --- a/0003-AWT-Font-fix-for-Cygwin.patch +++ /dev/null @@ -1,99 +0,0 @@ -From d586c363d6a880f816e77fe4970da29a417f7d45 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/21] 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.4.5 - |