mozilla-firebird port ready for testing

[Oliver Braun]

* Joe Marcus Clarke <marcus at 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/distfiles/.
>> 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)  
31992582 bytes transferred in 353.3 seconds (88.43 kBps)
===>  Extracting for mozilla-firebird-gtk2-0.6
>> Checksum OK for MozillaFirebird-0.6-source.tar.bz2.

Extracting source (this takes a while) ...

===>  Patching for mozilla-firebird-gtk2-0.6
===>  Applying FreeBSD patches for mozilla-firebird-gtk2-0.6
1 out of 5 hunks failed--saving rejects to gfx/src/gtk/nsFontMetricsXft.cpp.rej
>> 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
-- 
Oliver Braun :: obraun at unsane.org
  :: Work    => obraun at informatik.unibw-muenchen.de
  :: FreeBSD => obraun at FreeBSD.org -> http://people.freebsd.org/~obraun/
  :: Haskell => obraun at haskell.org -> http://haskell.org/freebsd/
-------------- next part --------------
Index: files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
===================================================================
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 @@
  
      // set up our charset
      mCharset = nsnull;
-@@ -1529,14 +1531,16 @@
+@@ -1529,7 +1531,7 @@
  XftFont *
  nsFontXft::GetXftFont(void)
  {
@@ -43,13 +43,15 @@
          FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
          if (!pat)
              return nsnull;
+@@ -1548,8 +1550,10 @@
+             FcPatternDel(pat, FC_SPACING);
  
          mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
 -        if (!mXftFont)
-+        if (!mXftFont) { 
++        if (!mXftFont) {
              FcPatternDestroy(pat);
-+	    mNotXft = 1;
-+	}
++            mNotXft = 1;
++        }
      }
  
      return mXftFont;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20030531/7afc4bae/attachment.bin