[openjdk-8] 04/04: Refreshed the patches (first pass)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Mar 31 15:25:16 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository openjdk-8.
commit d2536093b5b7c6075c62eac12848b32b7d85ef48
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Mar 31 17:23:34 2014 +0200
Refreshed the patches (first pass)
---
debian/patches/accessible-toolkit.patch | 7 +++---
debian/patches/atk-wrapper-security.patch | 6 ++---
debian/patches/hotspot-mips-align.diff | 6 ++---
debian/patches/hotspot-no-march-i586.diff | 8 +++----
debian/patches/hotspot-sparc-arch.diff | 6 ++---
debian/patches/icc_loading_with_symlink.diff | 14 +++++-------
debian/patches/icedtea-4953367.patch | 8 +++----
.../patches/icedtea-override-redirect-compiz.patch | 12 +++++-----
debian/patches/jdk-freetypeScaler-crash.diff | 24 ++++++++++----------
debian/patches/libpcsclite-dlopen.diff | 8 +++----
debian/patches/nonreparenting-wm.diff | 26 +++++++++++-----------
debian/patches/shebang.diff | 6 ++---
debian/patches/sparc-stubgenerator.diff | 12 +++++-----
debian/patches/zero-fpu-control-is-noop.diff | 6 ++---
14 files changed, 72 insertions(+), 77 deletions(-)
diff --git a/debian/patches/accessible-toolkit.patch b/debian/patches/accessible-toolkit.patch
index 222dcfb..b337a9c 100644
--- a/debian/patches/accessible-toolkit.patch
+++ b/debian/patches/accessible-toolkit.patch
@@ -1,7 +1,6 @@
-diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java openjdk/jdk/src/share/classes/java/awt/Toolkit.java
---- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
-+++ openjdk/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
-@@ -871,7 +871,11 @@
+--- a/jdk/src/share/classes/java/awt/Toolkit.java
++++ b/jdk/src/share/classes/java/awt/Toolkit.java
+@@ -894,7 +894,11 @@
return null;
}
});
diff --git a/debian/patches/atk-wrapper-security.patch b/debian/patches/atk-wrapper-security.patch
index b5dc7dd..3dce654 100644
--- a/debian/patches/atk-wrapper-security.patch
+++ b/debian/patches/atk-wrapper-security.patch
@@ -1,6 +1,6 @@
---- openjdk/jdk/src/share/lib/security/java.security-linux
-+++ openjdk/jdk/src/share/lib/security/java.security-linux
-@@ -128,6 +128,7 @@
+--- a/jdk/src/share/lib/security/java.security-linux
++++ b/jdk/src/share/lib/security/java.security-linux
+@@ -177,6 +177,7 @@
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
package.access=sun.,\
diff --git a/debian/patches/hotspot-mips-align.diff b/debian/patches/hotspot-mips-align.diff
index a976e5b..c2ef984 100644
--- a/debian/patches/hotspot-mips-align.diff
+++ b/debian/patches/hotspot-mips-align.diff
@@ -1,6 +1,6 @@
---- openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
-+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
-@@ -322,7 +322,7 @@
+--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
++++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+@@ -329,7 +329,7 @@
ThreadStateTransition::transition_from_java(thread, _thread_in_native);
// Make the call
diff --git a/debian/patches/hotspot-no-march-i586.diff b/debian/patches/hotspot-no-march-i586.diff
index 3c36e61..c886a91 100644
--- a/debian/patches/hotspot-no-march-i586.diff
+++ b/debian/patches/hotspot-no-march-i586.diff
@@ -1,13 +1,13 @@
# Don't explicitly build with -march=i586 on i386 architectures.
---- openjdk/hotspot/make/linux/makefiles/gcc.make~ 2012-09-03 11:00:18.813744653 +0200
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2012-09-03 13:06:48.869916169 +0200
-@@ -112,7 +112,7 @@
+--- a/hotspot/make/linux/makefiles/gcc.make
++++ b/hotspot/make/linux/makefiles/gcc.make
+@@ -171,7 +171,7 @@
endif
ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
-ARCHFLAG/i486 = -m32 -march=i586
+ARCHFLAG/i486 = -m32
- ARCHFLAG/amd64 = -m64
+ ARCHFLAG/amd64 = -m64 $(STACK_ALIGNMENT_OPT)
ARCHFLAG/ia64 =
ARCHFLAG/sparc = -m32 -mcpu=v9
diff --git a/debian/patches/hotspot-sparc-arch.diff b/debian/patches/hotspot-sparc-arch.diff
index 0dc97c5..5b8d479 100644
--- a/debian/patches/hotspot-sparc-arch.diff
+++ b/debian/patches/hotspot-sparc-arch.diff
@@ -1,6 +1,6 @@
---- openjdk/hotspot/make/linux/makefiles/defs.make.orig 2011-07-13 09:00:57.000000000 +0200
-+++ openjdk/hotspot/make/linux/makefiles/defs.make 2011-07-13 08:58:01.000000000 +0200
-@@ -58,7 +58,7 @@
+--- a/hotspot/make/linux/makefiles/defs.make
++++ b/hotspot/make/linux/makefiles/defs.make
+@@ -64,7 +64,7 @@
endif
# sparc
diff --git a/debian/patches/icc_loading_with_symlink.diff b/debian/patches/icc_loading_with_symlink.diff
index 7193221..d98afc6 100644
--- a/debian/patches/icc_loading_with_symlink.diff
+++ b/debian/patches/icc_loading_with_symlink.diff
@@ -12,21 +12,19 @@ Last-Update: 2012-05-18
Bug-Debian: http://bugs.debian.org/641530
Forwarded: not-yet
-Index: openjdk/jdk/src/share/classes/java/awt/color/ICC_Profile.java
-===================================================================
---- openjdk/jdk/src/share/classes/java/awt/color/ICC_Profile.java.orig
-+++ openjdk/jdk/src/share/classes/java/awt/color/ICC_Profile.java
-@@ -1821,9 +1821,6 @@
+--- a/jdk/src/share/classes/java/awt/color/ICC_Profile.java
++++ b/jdk/src/share/classes/java/awt/color/ICC_Profile.java
+@@ -1833,9 +1833,6 @@
dir = st.nextToken();
- fullPath = dir + File.separatorChar + fileName;
+ fullPath = dir + File.separatorChar + fileName;
f = new File(fullPath);
- if (!isChildOf(f, dir)) {
- f = null;
- }
}
}
-
-@@ -1860,7 +1857,7 @@
+
+@@ -1872,7 +1869,7 @@
File.separatorChar + "lib" + File.separatorChar + "cmm";
String fullPath = dir + File.separatorChar + fileName;
File f = new File(fullPath);
diff --git a/debian/patches/icedtea-4953367.patch b/debian/patches/icedtea-4953367.patch
index 0a45929..3037080 100644
--- a/debian/patches/icedtea-4953367.patch
+++ b/debian/patches/icedtea-4953367.patch
@@ -1,8 +1,8 @@
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4953367
---- openjdk/jdk/src/solaris/native/java/lang/java_props_md.c~ 2012-07-25 19:24:09.000000000 +0200
-+++ openjdk/jdk/src/solaris/native/java/lang/java_props_md.c 2012-08-29 17:15:33.184491738 +0200
-@@ -560,6 +560,7 @@
+--- a/jdk/src/solaris/native/java/lang/java_props_md.c
++++ b/jdk/src/solaris/native/java/lang/java_props_md.c
+@@ -612,6 +612,7 @@
sprops.path_separator = ":";
sprops.line_separator = "\n";
@@ -10,7 +10,7 @@ http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4953367
#if !defined(_ALLBSD_SOURCE)
/* Append CDE message and resource search path to NLSPATH and
* XFILESEARCHPATH, in order to pick localized message for
-@@ -568,7 +569,7 @@
+@@ -620,7 +621,7 @@
setPathEnvironment("NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat");
setPathEnvironment("XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt");
#endif
diff --git a/debian/patches/icedtea-override-redirect-compiz.patch b/debian/patches/icedtea-override-redirect-compiz.patch
index d42af92..6c694b2 100644
--- a/debian/patches/icedtea-override-redirect-compiz.patch
+++ b/debian/patches/icedtea-override-redirect-compiz.patch
@@ -1,12 +1,10 @@
-Index: openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
-===================================================================
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java.orig
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
-@@ -1143,6 +1143,7 @@
+--- a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
++++ b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
+@@ -1215,6 +1215,7 @@
+
boolean isOverrideRedirect() {
return XWM.getWMID() == XWM.OPENLOOK_WM ||
- (XWM.getWMID() == XWM.METACITY_WM ? true : false) ||
+ XWM.getWMID() == XWM.COMPIZ_WM ||
- target.getName().equals("###overrideRedirect###") ||
Window.Type.POPUP.equals(getWindowType());
}
+
diff --git a/debian/patches/jdk-freetypeScaler-crash.diff b/debian/patches/jdk-freetypeScaler-crash.diff
index 413ab91..4399260 100644
--- a/debian/patches/jdk-freetypeScaler-crash.diff
+++ b/debian/patches/jdk-freetypeScaler-crash.diff
@@ -24,18 +24,18 @@ Summary: NewGlobalRef/DeleteGlobalRef as needed.
Reviewed-by:
Contributed-by: yamauchi at google.com
---- openjdk/jdk/make/sun/font/mapfile-vers.openjdk.orig 2009-05-21 13:48:03.000000000 +0000
-+++ openjdk/jdk/make/sun/font/mapfile-vers.openjdk 2009-05-26 19:53:17.000000000 +0000
+--- a/jdk/make/mapfiles/libfontmanager/mapfile-vers.openjdk
++++ b/jdk/make/mapfiles/libfontmanager/mapfile-vers.openjdk
@@ -29,6 +29,7 @@
SUNWprivate_1.1 {
global:
+ JNI_OnLoad;
getSunFontIDs;
- newLayoutTableCache;
+ newLayoutTableCache;
freeLayoutTableCache;
---- openjdk/jdk/src/share/native/sun/font/freetypeScaler.c.orig 2009-05-21 13:48:03.000000000 +0000
-+++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c 2009-05-26 19:53:17.000000000 +0000
+--- a/jdk/src/share/native/sun/font/freetypeScaler.c
++++ b/jdk/src/share/native/sun/font/freetypeScaler.c
@@ -48,16 +48,6 @@
#define ROUND(x) ((int) (x+0.5))
@@ -67,7 +67,7 @@ Contributed-by: yamauchi at google.com
/**************** Error handling utilities *****************/
static jmethodID invalidateScalerMID;
-@@ -108,6 +105,10 @@
+@@ -120,6 +117,10 @@
FT_Done_Face(scalerInfo->face);
FT_Done_FreeType(scalerInfo->library);
@@ -78,7 +78,7 @@ Contributed-by: yamauchi at google.com
if (scalerInfo->directBuffer != NULL) {
(*env)->DeleteGlobalRef(env, scalerInfo->directBuffer);
}
-@@ -131,10 +132,9 @@
+@@ -147,10 +148,9 @@
#define FILEDATACACHESIZE 1024
@@ -90,7 +90,7 @@ Contributed-by: yamauchi at google.com
jclass tmpClass = (*env)->FindClass(env, "sun/font/TrueTypeFont");
jfieldID platNameField =
(*env)->GetFieldID(env, tmpClass, "platName", "Ljava/lang/String;");
-@@ -150,8 +150,8 @@
+@@ -166,8 +166,8 @@
unsigned char* destBuffer,
unsigned long numBytes)
{
@@ -100,7 +100,7 @@ Contributed-by: yamauchi at google.com
jobject bBuffer;
int bread = 0;
-@@ -245,8 +245,7 @@
+@@ -260,8 +260,7 @@
if (scalerInfo == NULL)
return 0;
@@ -110,7 +110,7 @@ Contributed-by: yamauchi at google.com
scalerInfo->fontDataOffset = 0;
scalerInfo->fontDataLength = 0;
scalerInfo->fileSize = filesize;
-@@ -263,6 +262,7 @@
+@@ -278,6 +277,7 @@
*/
error = FT_Init_FreeType(&scalerInfo->library);
if (error) {
@@ -118,7 +118,7 @@ Contributed-by: yamauchi at google.com
free(scalerInfo);
return 0;
}
-@@ -331,6 +331,7 @@
+@@ -348,6 +348,7 @@
}
if (scalerInfo->fontData != NULL)
free(scalerInfo->fontData);
@@ -126,7 +126,7 @@ Contributed-by: yamauchi at google.com
free(scalerInfo);
return 0;
}
-@@ -391,8 +392,10 @@
+@@ -408,8 +409,10 @@
FTScalerContext *context) {
int errCode = 0;
diff --git a/debian/patches/libpcsclite-dlopen.diff b/debian/patches/libpcsclite-dlopen.diff
index 943c008..0562d4d 100644
--- a/debian/patches/libpcsclite-dlopen.diff
+++ b/debian/patches/libpcsclite-dlopen.diff
@@ -1,12 +1,12 @@
---- openjdk/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java~ 2014-01-28 18:02:26.000000000 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java 2014-01-30 13:53:42.028872034 +0000
+--- a/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java
++++ b/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java
@@ -48,6 +48,7 @@
private final static String PROP_NAME = "sun.security.smartcardio.library";
+ private final static String LIB0 = "libpcsclite.so.1";
- private final static String LIB1 = "/usr/$LIBISA/libpcsclite.so.1";
- private final static String LIB2 = "/usr/local/$LIBISA/libpcsclite.so.1";
+ private final static String LIB1 = "/usr/$LIBISA/libpcsclite.so";
+ private final static String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
private final static String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
@@ -104,22 +105,9 @@
if (lib.length() != 0) {
diff --git a/debian/patches/nonreparenting-wm.diff b/debian/patches/nonreparenting-wm.diff
index 89fe3f2..3562814 100644
--- a/debian/patches/nonreparenting-wm.diff
+++ b/debian/patches/nonreparenting-wm.diff
@@ -1,25 +1,25 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-@@ -105,7 +105,8 @@
+--- a/jdk/src/solaris/classes/sun/awt/X11/XWM.java
++++ b/jdk/src/solaris/classes/sun/awt/X11/XWM.java
+@@ -104,7 +104,8 @@
+ COMPIZ_WM = 12,
LG3D_WM = 13,
CWM_WM = 14,
- MUTTER_WM = 15,
-- MARCO_WM = 16;
-+ MARCO_WM = 16,
-+ OTHER_NONREPARENTING_WM = 17;
+- MUTTER_WM = 15;
++ MUTTER_WM = 15,
++ OTHER_NONREPARENTING_WM = 16;
public String toString() {
switch (WMID) {
case NO_WM:
-@@ -591,7 +592,7 @@
- // TODO: according to wikipedia, compiz is now reparenting. This should
- // probably be updated.
+@@ -596,7 +597,7 @@
+ }
+
static boolean isNonReparentingWM() {
- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM);
+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
}
/*
-@@ -781,9 +782,17 @@
+@@ -791,9 +792,17 @@
* supports WIN or _NET wm spec.
*/
else if (l_net_protocol.active()) {
@@ -39,7 +39,7 @@
}
/*
* Check for legacy WMs.
-@@ -794,6 +803,8 @@
+@@ -804,6 +813,8 @@
awt_wmgr = XWM.MOTIF_WM;
} else if (isOpenLook()) {
awt_wmgr = XWM.OPENLOOK_WM;
@@ -48,7 +48,7 @@
} else {
awt_wmgr = XWM.OTHER_WM;
}
-@@ -1309,6 +1320,7 @@
+@@ -1332,6 +1343,7 @@
res = new Insets(28, 6, 6, 6);
break;
case NO_WM:
diff --git a/debian/patches/shebang.diff b/debian/patches/shebang.diff
index 5767953..fc08ba3 100644
--- a/debian/patches/shebang.diff
+++ b/debian/patches/shebang.diff
@@ -1,7 +1,7 @@
---- openjdk/jdk/src/share/sample/scripting/scriptpad/src/scripts/memory.sh.orig 2010-08-27 20:01:53.000000000 +0200
-+++ openjdk/jdk/src/share/sample/scripting/scriptpad/src/scripts/memory.sh 2010-09-07 05:23:10.337191651 +0200
+--- a/jdk/src/share/sample/scripting/scriptpad/src/scripts/memory.sh
++++ b/jdk/src/share/sample/scripting/scriptpad/src/scripts/memory.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
#
- # Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
#
diff --git a/debian/patches/sparc-stubgenerator.diff b/debian/patches/sparc-stubgenerator.diff
index fe11a0d..4e0ea20 100644
--- a/debian/patches/sparc-stubgenerator.diff
+++ b/debian/patches/sparc-stubgenerator.diff
@@ -1,9 +1,9 @@
Author: Damien Raude-Morvan <drazzib at debian.org>
Description: Fix FTBFS on sparc on stubGenerator_sparc.cpp by using explicit class typedef.
---- openjdk/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp.orig 2012-02-15 08:26:53.000000000 +0000
-+++ openjdk/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp 2012-02-26 10:26:11.000000000 +0000
-@@ -1126,7 +1126,7 @@
+--- a/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp
++++ b/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp
+@@ -1055,7 +1055,7 @@
Label& L_loop, bool use_prefetch, bool use_bis);
void disjoint_copy_core(Register from, Register to, Register count, int log2_elem_size,
@@ -12,7 +12,7 @@ Description: Fix FTBFS on sparc on stubGenerator_sparc.cpp by using explicit cla
Label L_copy;
assert(log2_elem_size <= 3, "the following code should be changed");
-@@ -1277,7 +1277,8 @@
+@@ -1206,7 +1206,8 @@
__ inc(from, 8);
__ sllx(O3, left_shift, O3);
@@ -22,7 +22,7 @@ Description: Fix FTBFS on sparc on stubGenerator_sparc.cpp by using explicit cla
__ inccc(count, count_dec>>1 ); // + 8 bytes
__ brx(Assembler::negative, true, Assembler::pn, L_copy_last_bytes);
-@@ -2156,7 +2157,8 @@
+@@ -2085,7 +2086,8 @@
__ dec(count, 4); // The cmp at the beginning guaranty count >= 4
__ sllx(O3, 32, O3);
@@ -32,7 +32,7 @@ Description: Fix FTBFS on sparc on stubGenerator_sparc.cpp by using explicit cla
__ br(Assembler::always, false, Assembler::pt, L_copy_4_bytes);
__ delayed()->inc(count, 4); // restore 'count'
-@@ -2437,7 +2439,8 @@
+@@ -2366,7 +2368,8 @@
// count >= 0 (original count - 8)
__ mov(from, from64);
diff --git a/debian/patches/zero-fpu-control-is-noop.diff b/debian/patches/zero-fpu-control-is-noop.diff
index 706a7e0..af91ab5 100644
--- a/debian/patches/zero-fpu-control-is-noop.diff
+++ b/debian/patches/zero-fpu-control-is-noop.diff
@@ -8,9 +8,9 @@ Description: ZeroVM fix under IA32. Actual code in
Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2011-08-02
Forwarded: http://mail.openjdk.java.net/pipermail/zero-dev/2011-August/000398.html
---- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.orig
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -265,11 +265,12 @@
+--- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
++++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+@@ -259,11 +259,12 @@
}
int os::Linux::get_fpu_control_word() {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git
More information about the pkg-java-commits
mailing list