Date: Sat, 31 May 2003 11:38:22 +0200 From: Oliver Braun <obraun@FreeBSD.org> To: Joe Marcus Clarke <marcus@FreeBSD.org> Cc: ports@FreeBSD.org Subject: Re: mozilla-firebird port ready for testing Message-ID: <20030531093822.GA1565@unsane.de> In-Reply-To: <1054366060.65940.5.camel@shumai.marcuscom.com> References: <1054366060.65940.5.camel@shumai.marcuscom.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--z6Eq5LdranGa6ru8 Content-Type: multipart/mixed; boundary="9amGYk9869ThD9tj" Content-Disposition: inline --9amGYk9869ThD9tj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Joe Marcus Clarke <marcus@FreeBSD.org> [2003-05-31 03:27 -0400]: > I've just added the mozilla-firebird port to my CVS repo. # make >> MozillaFirebird-0.6-source.tar.bz2 doesn't seem to exist in /usr/ports/d= istfiles/. >> Attempting to fetch from http://komodo.mozilla.org/pub/firebird/releases= /0.6/. Receiving MozillaFirebird-0.6-source.tar.bz2 (31992582 bytes): 100% (ETA 00= :00) =20 31992582 bytes transferred in 353.3 seconds (88.43 kBps) =3D=3D=3D> Extracting for mozilla-firebird-gtk2-0.6 >> Checksum OK for MozillaFirebird-0.6-source.tar.bz2. Extracting source (this takes a while) ... =3D=3D=3D> Patching for mozilla-firebird-gtk2-0.6 =3D=3D=3D> Applying FreeBSD patches for mozilla-firebird-gtk2-0.6 1 out of 5 hunks failed--saving rejects to gfx/src/gtk/nsFontMetricsXft.cpp= =2Erej >> Patch patch-gfx_src_gtk_nsFontMetricsXft.cpp failed to apply cleanly. >> Patch(es) patch-Double.cpp patch-alpha applied cleanly. *** Error code 1 Fix is attached. Regards, Olli --=20 Oliver Braun :: obraun@unsane.org :: Work =3D> obraun@informatik.unibw-muenchen.de :: FreeBSD =3D> obraun@FreeBSD.org -> http://people.freebsd.org/~obraun/ :: Haskell =3D> obraun@haskell.org -> http://haskell.org/freebsd/ --9amGYk9869ThD9tj Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="mozilla-firebird.diff" Content-Transfer-Encoding: quoted-printable Index: files/patch-gfx_src_gtk_nsFontMetricsXft.cpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /space/cvs/marcuscom-cvs/ports-stable/www/mozilla-firebird/files/= patch-gfx_src_gtk_nsFontMetricsXft.cpp,v retrieving revision 1.1 diff -u -r1.1 patch-gfx_src_gtk_nsFontMetricsXft.cpp --- files/patch-gfx_src_gtk_nsFontMetricsXft.cpp 31 May 2003 07:22:19 -0000= 1.1 +++ files/patch-gfx_src_gtk_nsFontMetricsXft.cpp 31 May 2003 09:34:46 -0000 @@ -1,5 +1,5 @@ ---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Tue Mar 25 16:13:01 2003 -+++ gfx/src/gtk/nsFontMetricsXft.cpp Mon Apr 14 10:21:18 2003 +--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Mon May 12 06:03:28 2003 ++++ gfx/src/gtk/nsFontMetricsXft.cpp Sat May 31 11:32:14 2003 @@ -90,6 +90,7 @@ FcPattern *mPattern; FcPattern *mFontName; @@ -34,7 +34,7 @@ =20 // set up our charset mCharset =3D nsnull; -@@ -1529,14 +1531,16 @@ +@@ -1529,7 +1531,7 @@ XftFont * nsFontXft::GetXftFont(void) { @@ -43,13 +43,15 @@ FcPattern *pat =3D FcFontRenderPrepare(0, mPattern, mFontName); if (!pat) return nsnull; +@@ -1548,8 +1550,10 @@ + FcPatternDel(pat, FC_SPACING); =20 mXftFont =3D XftFontOpenPattern(GDK_DISPLAY(), pat); - if (!mXftFont) -+ if (!mXftFont) {=20 ++ if (!mXftFont) { FcPatternDestroy(pat); -+ mNotXft =3D 1; -+ } ++ mNotXft =3D 1; ++ } } =20 return mXftFont; --9amGYk9869ThD9tj-- --z6Eq5LdranGa6ru8 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2 (FreeBSD) iD8DBQE+2HgOwLFrfe8lsboRAkyfAJ9mSB2tDfEqxjWkCQbP7nrwFEOjwACfV7DN wIC1Jj1y9gOr55/+ONlqyoA= =C4WZ -----END PGP SIGNATURE----- --z6Eq5LdranGa6ru8--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030531093822.GA1565>