www/firefox (r315793, 20.0.1) does not compile

[Matthias Apitz]

El día Saturday, April 13, 2013 a las 06:10:24PM +0200, Florian Smeets escribió:

> On 13.04.13 16:26, Matthias Apitz wrote:
> > 
> > # cd /usr/ports/www/firefox
> > # svn up
> > # make install BATCH=yes
> > ...
> > /usr/ports/www/firefox/work/mozilla-release/memory/mozalloc/mozalloc.cpp:214:12:
> > error: 
> >       use of undeclared identifier 'malloc_usable_size'; did you mean
> >       'moz_malloc_usable_size'?
> >     return malloc_usable_size(ptr);
> >            ^~~~~~~~~~~~~~~~~~
> >            moz_malloc_usable_size
> > /usr/ports/www/firefox/work/mozilla-release/memory/mozalloc/mozalloc.cpp:206:1:
> > note: 
> >       'moz_malloc_usable_size' declared here
> > moz_malloc_usable_size(void *ptr)
> > 
> 
> Hi,
> 
> i think you mean firefox 20.0, there is no firefox 20.0.1 in ports,
> 20.0.1 is a Windows only fix. Anyway, even if you updated the distinfo
> and version yourself it should still build.

Hi,

The system is:

# uname -a
FreeBSD aurora.Sisis.de 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r235646: Sat May 19 15:52:36 CEST 2012 guru at aurora.Sisis.de:/usr/obj/usr/src/sys/GENERIC  i386

and the ports tree is from SVN r315646; this have had some 19.x version
in www/firefox with the same problem as shown above; that's why I have
update www/firefox (only) with 'svn up' to r315793 and the resulting
version in Makefile is

DISTVERSION=    20.0
PORTEPOCH=      1

(that's why I said 20.0.1, which was wrong);

in any case, the problem remained and I did for now the following
workaround:

# diff -c work/mozilla-release/memory/mozalloc/mozalloc.cpp*
*** work/mozilla-release/memory/mozalloc/mozalloc.cpp   Sat Apr 13
16:32:42 2013
--- work/mozilla-release/memory/mozalloc/mozalloc.cpp.orig      Tue Mar
26 23:17:58 2013
***************
*** 211,217 ****
  #if defined(XP_MACOSX)
      return malloc_size(ptr);
  #elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY)
!     return moz_malloc_usable_size(ptr);
  #elif defined(XP_WIN)
      return _msize(ptr);
  #else
--- 211,217 ----
  #if defined(XP_MACOSX)
      return malloc_size(ptr);
  #elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY)
!     return malloc_usable_size(ptr);
  #elif defined(XP_WIN)
      return _msize(ptr);
  #else

With this it seems to build fine (still compiling, but behind the point
of the above problem already).

HIH

	matthias

-- 
Matthias Apitz               |  /"\ ASCII Ribbon Campaign: www.asciiribbon.org
E-mail: guru at unixarea.de     |  \ / - No HTML/RTF in E-mail
WWW: http://www.unixarea.de/ |   X  - No proprietary attachments
phone: +49-170-4527211       |  / \ - Respect for open standards