Firefox 3.0b5 (for those of you who don't want to wait)

[Carl Johan Gustavsson]

Michael Johnson wrote:
> We have put together a small striped down version of marcuscom ports (
> http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi/ports) that contains the
> ever so wanted Firefox 3.0b5 and a few updated ports needed for Firefox
> 3.0b5.
>
> ChangeLog
> -> Update www/firefox-devel to 3.0b5
> -> Merge www/mozilla/Makefile.common and www/mozilla/bsd.gecko.mk into
>    Mk/bsd.gecko.mk.
> -> Extend USE_GNOME=ltverhack to support defined lib versions
>    ie: USE_GNOME=ltverhack:9 will install libs as libname.so.9
> -> Update x11/pixman to 0.10.0
> --> Update graphics/cairo to 1.6.4
> ---> Update graphics/p5-Cairo to 1.053
> ---> Update graphics/cairomm to 1.6.0
> ----> Update graphics/poppler[-gtk|-qt|-qt4] to 0.8.0
> -----> Chase graphics/poppler in graphics/gimp-app,
> graphics/epdfview
>        graphics/evince, sysutils/tracker-client
>
> == From README.txt ==
> Firefox 3.0b5 portkit for FreeBSD.
>
> Directions:
> - Run 'sh marcusmerge.sh' (in the current directory)
> - portupgrade -a or portmaster -a
> - cd /usr/ports/www/firefox-devel && make install
>
> Unmerge:
> Run 'sh unmerge.sh' (in the current directory)
>
> Problems?
>
> Please contact gnome at FreeBSD.org
> and please do NOT file a bug report.
> == End ==
>
> Download : http://people.freebsd.org/~ahze/distfiles/firefox30kit.tar.bz2
>
> MD5 (firefox30kit.tar.bz2) = 7fbcae1884cfe69126b21c5f5b20bda4
> --
>
> Michael on behalf on the FreeBSD GNOME Team
> _______________________________________________
> freebsd-ports at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-ports
> To unsubscribe, send any mail to "freebsd-ports-unsubscribe at freebsd.org"
Hi

Tried this patch but it seems I can't upgrade cairomm. cairo was fine
though.

Build log:
----------------------------------

--->  Upgrading 'cairomm-1.4.8_2' to 'cairomm-1.6.0' (graphics/cairomm)
--->  Building '/usr/ports/graphics/cairomm'
===>  Cleaning for cairomm-1.6.0
===>  WARNING: Vulnerability database out of date, checking anyway
===>  Extracting for cairomm-1.6.0
=> MD5 Checksum OK for cairomm-1.6.0.tar.gz.
=> SHA256 Checksum OK for cairomm-1.6.0.tar.gz.
===>  Patching for cairomm-1.6.0
===>   cairomm-1.6.0 depends on file: /usr/local/bin/libtool - found
===>  Applying FreeBSD patches for cairomm-1.6.0
1 out of 1 hunks failed--saving rejects to cairomm/enums.h.rej
=> Patch patch-cairomm_enums.h failed to apply cleanly.
** Command failed [exit code 1]: /usr/bin/script -qa
/tmp/portupgrade.38935.0 env UPGRADE_TOOL=portupgrade
UPGRADE_PORT=cairomm-1.4.8_2 UPGRADE_PORT_VER=1.4.8_2 make
** Fix the problem and try again.
** Listing the failed packages (-:ignored / *:skipped / !:failed)
        ! graphics/cairomm (cairomm-1.4.8_2)    (patch error)

----------------------------------

cairomm/enums.h.rej contains:
----------------------------------

***************
*** 192,198 ****
      FONT_TYPE_TOY = CAIRO_FONT_TYPE_TOY,
      FONT_TYPE_FT = CAIRO_FONT_TYPE_FT,
      FONT_TYPE_WIN32 = CAIRO_FONT_TYPE_WIN32,
-     FONT_TYPE_ATSUI = CAIRO_FONT_TYPE_ATSUI
  } FontType;
 
  } // namespace Cairo
--- 192,198 ----
      FONT_TYPE_TOY = CAIRO_FONT_TYPE_TOY,
      FONT_TYPE_FT = CAIRO_FONT_TYPE_FT,
      FONT_TYPE_WIN32 = CAIRO_FONT_TYPE_WIN32,
+     FONT_TYPE_QUARTZ = CAIRO_FONT_TYPE_QUARTZ
  } FontType;
 
  } // namespace Cairo

----------------------------------

Thanks for your work

Regards,
Carl Johan Gustavsson

(Cc me please, I'm not subscribed to gnome@)