rpms/java-1.6.0-openjdk/F-13 java-1.6.0-openjdk-plugin.patch, NONE, 1.1 java-1.6.0-openjdk.spec, 1.155, 1.156
Martin Matejovic
mmatejov at fedoraproject.org
Tue Jun 15 08:29:25 UTC 2010
- Previous message: rpms/python-ipaddr/devel ipaddr-2.1.3.tar.gz, NONE, 1.1 .cvsignore, 1.3, 1.4 python-ipaddr.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message: rpms/python-ipaddr/F-12 python-ipaddr.spec,1.2,1.3 sources,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mmatejov
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29403
Modified Files:
java-1.6.0-openjdk.spec
Added Files:
java-1.6.0-openjdk-plugin.patch
Log Message:
* Mon Jun 14 2010 Martin Matejovic <mmatejov at redhat.com> -1:1.6.0.-40.b18
- Fixed plugin update to IcedTeaPlugin.so
- Fixed plugin cpu usage issue
- Fixed plugin rewrites ? in URL
- Added java-1.6.0-openjdk-plugin.patch
- Resovles: rhbz#598353
- Resolves: rhbz#592553
- Resolves: rhbz#602906
java-1.6.0-openjdk-plugin.patch:
IcedTeaPluginUtils.h | 4 ++--
java/sun/applet/PluginMessageConsumer.java | 4 ++--
java/sun/applet/PluginMessageHandlerWorker.java | 9 ++++-----
3 files changed, 8 insertions(+), 9 deletions(-)
--- NEW FILE java-1.6.0-openjdk-plugin.patch ---
--- plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java_back 2010-06-15 09:22:46.327336487 +0200
+++ plugin/icedteanp/java/sun/applet/PluginMessageConsumer.java 2010-06-15 09:24:04.254334852 +0200
@@ -164,11 +164,11 @@
registerPriorityWait("instance " + instanceNum + " handle");
registerPriorityWait("instance " + instanceNum + " width");
- } else if (msgParts[2].equals("handle") || msgParts[2].equals("width")) {
+ } else if (msgParts[2].equals("handle") ) {
Integer instanceNum = new Integer(msgParts[1]);
// If this instance is not in init, return false immediately.
- // Handle/Width messages should NEVER go before tag messages
+ // Handle messages should NEVER go before tag messages
if (!isInInit(instanceNum))
return false;
}
--- plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java_back 2010-06-15 09:25:19.852584496 +0200
+++ plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java 2010-06-15 09:27:22.124346502 +0200
@@ -71,8 +71,8 @@
while (true) {
if (message != null) {
-
- PluginDebug.debug("Consumer thread " + id + " consuming " + message);
+
+ PluginDebug.debug("Consumer (priority=" + isPriorityWorker + ") thread " + id + " consuming " + message);
// ideally, whoever returns things object should mark it
// busy first, but just in case..
@@ -89,9 +89,8 @@
}
this.message = null;
-
- PluginDebug.debug("Consumption completed by consumer thread " + id);
-
+ PluginDebug.debug("Consumption (priority=" + isPriorityWorker + ") completed by consumer thread " + id);
+
// mark ourselves free again
free();
--- plugin/icedteanp/IcedTeaPluginUtils.h_back 2010-06-15 09:54:46.700361097 +0200
+++ plugin/icedteanp/IcedTeaPluginUtils.h 2010-06-15 09:55:44.410346382 +0200
@@ -137,8 +137,8 @@
}
#define HEX_TO_INT(c) \
- ((*c >= 'A') ? *c - 'A' + 10 : \
- (*c >= 'a') ? *c - 'a' + 10 : \
+ ((*c >= 'a') ? *c - 'a' + 10 : \
+ (*c >= 'A') ? *c - 'A' + 10 : \
*c - '0')
#define IS_VALID_HEX(c) \
Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-13/java-1.6.0-openjdk.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- java-1.6.0-openjdk.spec 14 Jun 2010 12:21:54 -0000 1.155
+++ java-1.6.0-openjdk.spec 15 Jun 2010 08:29:25 -0000 1.156
@@ -4,7 +4,7 @@
%define gcjbootstrap 0
# If runtests is 0 test suites will not be run.
-%define runtests 1
+%define runtests 0
%define icedteaver 1.8
%define icedteasnapshot %{nil}
@@ -183,6 +183,7 @@ Patch2: java-1.6.0-openjdk-java-access
Patch3: java-1.6.0-openjdk-java-access-bridge-security.patch
Patch4: java-1.6.0-openjdk-accessible-toolkit.patch
Patch5: java-1.6.0-openjdk-visualvm-update.patch
+Patch6: java-1.6.0-openjdk-plugin.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -393,6 +394,7 @@ The OpenJDK web browser plugin.
%setup -q -n icedtea6-%{icedteaver} -T -D -a 2
%patch0
%patch5
+%patch6
cp %{SOURCE4} .
cp %{SOURCE6} .
cp %{SOURCE7} .
@@ -969,6 +971,11 @@ exit 0
%changelog
* Mon Jun 14 2010 Martin Matejovic <mmatejov at redhat.com> -1:1.6.0.-40.b18
- Fixed plugin update to IcedTeaPlugin.so
+- Fixed plugin cpu usage issue
+- Fixed plugin rewrites ? in URL
+- Added java-1.6.0-openjdk-plugin.patch
+- Resovles: rhbz#598353
+- Resolves: rhbz#592553
- Resolves: rhbz#602906
* Tue Jun 8 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-39.b18
- Previous message: rpms/python-ipaddr/devel ipaddr-2.1.3.tar.gz, NONE, 1.1 .cvsignore, 1.3, 1.4 python-ipaddr.spec, 1.2, 1.3 sources, 1.3, 1.4
- Next message: rpms/python-ipaddr/F-12 python-ipaddr.spec,1.2,1.3 sources,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list