1.1.{2,3} release [Was: Re: Bug#519883: please upgrade to allow users to use spacebar]

[Mike Hommey]

On Mon, Mar 16, 2009 at 01:29:37PM +0100, Mike Hommey wrote:
> On Mon, Mar 16, 2009 at 09:17:09AM -0300, Gustavo Noronha <kov at debian.org> wrote:
> > On Mon, 2009-03-16 at 07:42 +0100, Mike Hommey wrote:
> > > On Sun, Mar 15, 2009 at 07:19:13PM -0300, Gustavo Noronha wrote:
> > > > On Mon, 2009-03-16 at 05:16 +0800, jidanni at jidanni.org wrote:
> > > > > According to
> > > > > http://www.twotoasts.de/bugs/index.php?do=details&task_id=298
> > > > > webkit must be upgraded to allow SPACEBAR to work in midori.
> > > > 
> > > > 1.1.2 is needed... if all goes right, I'm planning to do have an upload
> > > > done by tuesday, but to experimental, yet.
> > > 
> > > Do you have a tarball for 1.1.2 ? I see there is already a tarball for
> > 
> > Here it is, I asked Xan to upload it for us:
> > 
> > 	http://webkitgtk.org/old/webkit-1.1.2.tar.gz.
> 
> Thanks, I'll push it on git.d.o tonight (GMT+1).

The webkit-1.1 branch is up-to-date, now.

> > > 1.1.3 on http://webkitgtk.org/, but I'd like to have both in VCS for
> > > history purposes. I suggest you let me handle updating the webkit-1.1
> > > branch with the upstream tarballs while the procedure is still
> > > cumbersome and requires git plumbing knowledge. I'll come up with some
> > > script to handle that automatically in the future.
> > 
> > Sure thing. I'll be updating debian/copyright in the meantime =)
> 
> Please also take a look at bug #519924 about missing symbols in the
> symbols file:
> - ctiTrampoline at Base 1.1.1
> - ctiVMThrowTrampoline at Base 1.1.1
> 
> If these symbols are not in the API it would be safer not to export them,
> especially considering they are apparently appearing depending on the arch.
> 
> If you need help with symbols handling, drop me a line ;)

I took a quick look at the issue, and it appears these symbols are
related to the JIT javascript engine. They shouldn't actually be
exported, IMHO, as they are implementation detail and not API.
I think the attached patch may work, though I haven't tested.

Also, a small note about c639264. When cherry-picking commits from the
upstream branch, please avoid pulling the ChangeLog, too, as it contains
too many entries with the default merge algorithm.

Mike
-------------- next part --------------
diff --git a/JavaScriptCore/jit/JIT.cpp b/JavaScriptCore/jit/JIT.cpp
index 00714c6..a141c61 100644
--- a/JavaScriptCore/jit/JIT.cpp
+++ b/JavaScriptCore/jit/JIT.cpp
@@ -56,7 +56,7 @@ COMPILE_ASSERT(STUB_ARGS_callFrame == 0x0E, STUB_ARGS_callFrame_is_0x0E);
 #endif
 
 asm(
-".globl " SYMBOL_STRING(ctiTrampoline) "\n"
+".hidden " SYMBOL_STRING(ctiTrampoline) "\n"
 SYMBOL_STRING(ctiTrampoline) ":" "\n"
     "pushl %ebp" "\n"
     "movl %esp, %ebp" "\n"
@@ -76,7 +76,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
 );
 
 asm(
-".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
+".hidden " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
 #if USE(JIT_STUB_ARGUMENT_VA_LIST)
     "call " SYMBOL_STRING(_ZN3JSC8JITStubs12cti_vm_throwEPvz) "\n"
@@ -108,7 +108,7 @@ COMPILE_ASSERT(STUB_ARGS_callFrame == 0x12, STUB_ARGS_callFrame_is_0x12);
 #endif
 
 asm(
-".globl " SYMBOL_STRING(ctiTrampoline) "\n"
+".hidden " SYMBOL_STRING(ctiTrampoline) "\n"
 SYMBOL_STRING(ctiTrampoline) ":" "\n"
     "pushq %rbp" "\n"
     "movq %rsp, %rbp" "\n"
@@ -134,7 +134,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
 );
 
 asm(
-".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
+".hidden " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
 SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
 #if USE(JIT_STUB_ARGUMENT_REGISTER)
     "movq %rsp, %rdi" "\n"
diff --git a/debian/libwebkit-1.0-2.symbols b/debian/libwebkit-1.0-2.symbols
index 11851f1..edddeba 100644
--- a/debian/libwebkit-1.0-2.symbols
+++ b/debian/libwebkit-1.0-2.symbols
@@ -75,8 +75,6 @@ libwebkit-1.0.so.2 libwebkit-1.0-2 #MINVER#
  JSValueToObject at Base 1.1.1
  JSValueToStringCopy at Base 1.1.1
  JSValueUnprotect at Base 1.1.1
- ctiTrampoline at Base 1.1.1
- ctiVMThrowTrampoline at Base 1.1.1
  kJSClassDefinitionEmpty at Base 1.1.1
  webkit_get_default_session at Base 1.1.1
  webkit_major_version at Base 1.1.1