diff options
-rw-r--r-- | 0003-AWT-Font-fix-for-Cygwin.patch | 99 | ||||
-rw-r--r-- | 0004-Cygwin-ioctl-may-emit-EINVAL.patch | 27 | ||||
-rw-r--r-- | 0005-use-avoid-version-if-not-tracking-SO-version.patch | 39 | ||||
-rw-r--r-- | 0006-cygwin-uses-cyg-library-prefix.patch | 51 | ||||
-rw-r--r-- | cygwin-gcc.spec | 8 |
5 files changed, 0 insertions, 224 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 - diff --git a/0004-Cygwin-ioctl-may-emit-EINVAL.patch b/0004-Cygwin-ioctl-may-emit-EINVAL.patch deleted file mode 100644 index e46d4aa..0000000 --- a/0004-Cygwin-ioctl-may-emit-EINVAL.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f590da14fcd201f8f2a1538523a6cfc279861842 Mon Sep 17 00:00:00 2001 -From: Jonathan Yong <10walls@gmail.com> -Date: Sat, 28 Jun 2014 08:37:16 +0800 -Subject: [PATCH 04/21] Cygwin ioctl may emit EINVAL - -On Cygwin (on X86) ioctl on FIONREAD returns EINVAL on the errno variable instead of ENOTTY -http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35536 ---- - libjava/gnu/java/nio/channels/natFileChannelPosix.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc -index e05904c..0a2569c 100644 ---- a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc -+++ b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc -@@ -386,7 +386,7 @@ FileChannelImpl::available (void) - - #if defined (FIONREAD) - r = ::ioctl (fd, FIONREAD, &num); -- if (r == -1 && errno == ENOTTY) -+ if (r == -1 && (errno == ENOTTY || errno == EINVAL)) - { - // If the ioctl doesn't work, we don't care. - r = 0; --- -2.4.5 - diff --git a/0005-use-avoid-version-if-not-tracking-SO-version.patch b/0005-use-avoid-version-if-not-tracking-SO-version.patch deleted file mode 100644 index 32edb2d..0000000 --- a/0005-use-avoid-version-if-not-tracking-SO-version.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 562f01f9f740937c28d59ce37770a07716039d52 Mon Sep 17 00:00:00 2001 -From: Jonathan Yong <10walls@gmail.com> -Date: Sat, 28 Jun 2014 08:45:53 +0800 -Subject: [PATCH 05/21] use -avoid-version if not tracking SO version - ---- - libjava/classpath/configure | 2 +- - libjava/classpath/configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libjava/classpath/configure b/libjava/classpath/configure -index 6d46403..801f6ec 100755 ---- a/libjava/classpath/configure -+++ b/libjava/classpath/configure -@@ -3181,7 +3181,7 @@ case "$host_os" in - cp_module="" - ;; - *) -- cp_module="-module" -+ cp_module="-module -avoid-version" - ;; - esac - -diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac -index 245e1df..5c6f229 100644 ---- a/libjava/classpath/configure.ac -+++ b/libjava/classpath/configure.ac -@@ -64,7 +64,7 @@ case "$host_os" in - cp_module="" - ;; - *) -- cp_module="-module" -+ cp_module="-module -avoid-version" - ;; - esac - --- -2.4.5 - diff --git a/0006-cygwin-uses-cyg-library-prefix.patch b/0006-cygwin-uses-cyg-library-prefix.patch deleted file mode 100644 index 2914347..0000000 --- a/0006-cygwin-uses-cyg-library-prefix.patch +++ /dev/null @@ -1,51 +0,0 @@ -From aa3bb322bfa366fee3cfd83646bd0c049957ff05 Mon Sep 17 00:00:00 2001 -From: Jonathan Yong <10walls@gmail.com> -Date: Sat, 28 Jun 2014 08:48:56 +0800 -Subject: [PATCH 06/21] cygwin uses cyg library prefix - ---- - libjava/include/posix.h | 6 ++++++ - libjava/java/net/natVMURLConnection.cc | 4 ++++ - 2 files changed, 10 insertions(+) - -diff --git a/libjava/include/posix.h b/libjava/include/posix.h -index 6bd560c..cbda784 100644 ---- a/libjava/include/posix.h -+++ b/libjava/include/posix.h -@@ -42,11 +42,17 @@ details. */ - #include <java/util/Properties.h> - - // Prefix and suffix for shared libraries. -+#ifdef __CYGWIN__ -+#define _Jv_platform_solib_prefix "cyg" -+#else - #define _Jv_platform_solib_prefix "lib" -+#endif - #if defined(__APPLE__) && defined(__MACH__) - #define _Jv_platform_solib_suffix ".dylib" - #elif defined(HPUX) && defined(HP_PA) - #define _Jv_platform_solib_suffix ".sl" -+#elif defined(__CYGWIN__) -+#define _Jv_platform_solib_suffix ".dll" - #else - #define _Jv_platform_solib_suffix ".so" - #endif -diff --git a/libjava/java/net/natVMURLConnection.cc b/libjava/java/net/natVMURLConnection.cc -index 0a30a21..810e045 100644 ---- a/libjava/java/net/natVMURLConnection.cc -+++ b/libjava/java/net/natVMURLConnection.cc -@@ -32,7 +32,11 @@ void - java::net::VMURLConnection::init () - { - #if defined (HAVE_MAGIC_T) && defined (HAVE_MAGIC_H) && defined (USE_LTDL) -+#ifdef __CYGWIN__ -+ lt_dlhandle handle = lt_dlopenext ("cygmagic-1.dll"); -+#else - lt_dlhandle handle = lt_dlopenext ("libmagic.so"); -+#endif - if (!handle) - return; - --- -2.4.5 - diff --git a/cygwin-gcc.spec b/cygwin-gcc.spec index 400c3c8..0bc75ad 100644 --- a/cygwin-gcc.spec +++ b/cygwin-gcc.spec @@ -50,10 +50,6 @@ Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gcc_version}/gcc-%{gcc_ # Cygwin patches Patch1: 0001-share-mingw-fset-stack-executable-with-cygwin.patch #Patch2: 0002-boehm-gc-for-cygwin.patch -#Patch3: 0003-AWT-Font-fix-for-Cygwin.patch -#Patch4: 0004-Cygwin-ioctl-may-emit-EINVAL.patch -#Patch5: 0005-use-avoid-version-if-not-tracking-SO-version.patch -#Patch6: 0006-cygwin-uses-cyg-library-prefix.patch Patch7: 0007-Avoid-installing-libffi-V2.patch #Patch8: 0008-libitm-libtool-fixes-for-Cygwin.patch Patch9: 0009-Cygwin-uses-sysv-ABI-on-x86_64-V2.patch @@ -300,10 +296,6 @@ Cygwin x86_64 cross-compiler for Ada. %setup -q -n gcc-%{gcc_version} %patch1 -p1 #patch2 -p1 -#patch3 -p1 -#patch4 -p1 -#patch5 -p1 -#patch6 -p1 %patch7 -p1 #patch8 -p1 %patch9 -p1 |