+++ /dev/null
-Index: content/canvas/src/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/content/canvas/src/Makefile.in,v
-retrieving revision 1.4
-diff -u -r1.4 Makefile.in
---- content/canvas/src/Makefile.in 11 May 2005 23:49:51 -0000 1.4
-+++ content/canvas/src/Makefile.in 22 Aug 2005 19:57:51 -0000
-@@ -94,4 +94,6 @@
-
- include $(topsrcdir)/config/rules.mk
-
-+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
-+
- DEFINES += -D_IMPL_NS_LAYOUT
+++ /dev/null
-Index: toolkit/mozapps/installer/packager.mk
-===================================================================
-RCS file: /cvsroot/mozilla/toolkit/mozapps/installer/packager.mk,v
-retrieving revision 1.13
-diff -d -u -p -6 -r1.13 packager.mk
---- toolkit/mozapps/installer/packager.mk 1 Jul 2005 01:18:49 -0000 1.13
-+++ toolkit/mozapps/installer/packager.mk 18 Jul 2005 06:00:20 -0000
-@@ -207,13 +207,13 @@ ifdef MOZ_PKG_MANIFEST
- $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_APPNAME)/components -v -o $(PKGCP_OS)
- else # !MOZ_PKG_MANIFEST
- ifeq ($(MOZ_PKG_FORMAT),DMG)
- @cd $(DIST) && rsync -auvL $(_APPNAME) $(MOZ_PKG_APPNAME)
- else
- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_APPNAME); tar -xf -)
--ifdef MOZ_NATIVE_NSPR
-+ifndef MOZ_NATIVE_NSPR
- ifndef EXCLUDE_NSPR_LIBS
- @echo "Copying NSPR libs..."
- @cp -p $(NSPR_LDIR)/*$(DLL_SUFFIX) $(DIST)/$(MOZ_PKG_APPNAME)
- @chmod 755 $(DIST)/$(MOZ_PKG_APPNAME)/*$(DLL_SUFFIX)
- endif
- endif
+++ /dev/null
-Index: netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp,v
-retrieving revision 1.7.20.1
-diff -u -r1.7.20.1 nsHttpConnectionMgr.cpp
---- netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 1 Sep 2004 23:31:03 -0000 1.7.20.1
-+++ netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 4 Mar 2005 19:59:57 -0000
-@@ -834,8 +834,8 @@
- void
- nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
- {
-- PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16;
-- PRUint16 value = PRUint32(param) & 0x0000FFFF;
-+ PRUint16 name = (NS_PTR_TO_INT32(param) & 0xFFFF0000) >> 16;
-+ PRUint16 value = NS_PTR_TO_INT32(param) & 0x0000FFFF;
-
- switch (name) {
- case MAX_CONNECTIONS:
-Index: widget/src/gtk2/nsDragService.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v
-retrieving revision 1.5
-diff -u -r1.5 nsDragService.cpp
---- widget/src/gtk2/nsDragService.cpp 30 Oct 2003 01:48:41 -0000 1.5
-+++ widget/src/gtk2/nsDragService.cpp 4 Mar 2005 20:00:01 -0000
-@@ -838,7 +838,7 @@
- (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
- listTarget->target = g_strdup(gMimeListType);
- listTarget->flags = 0;
-- listTarget->info = (guint)listAtom;
-+ listTarget->info = (guint)(NS_PTR_TO_INT32(listAtom));
- PR_LOG(sDragLm, PR_LOG_DEBUG,
- ("automatically adding target %s with id %ld\n",
- listTarget->target, listAtom));
-@@ -877,7 +877,7 @@
- (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
- listTarget->target = g_strdup(gTextUriListType);
- listTarget->flags = 0;
-- listTarget->info = (guint)listAtom;
-+ listTarget->info = (guint)NS_PTR_TO_INT32(listAtom);
- PR_LOG(sDragLm, PR_LOG_DEBUG,
- ("automatically adding target %s with \
- id %ld\n", listTarget->target, listAtom));
-@@ -914,7 +914,7 @@
- (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
- target->target = g_strdup(flavorStr);
- target->flags = 0;
-- target->info = (guint)atom;
-+ target->info = (guint)NS_PTR_TO_INT32(atom);
- PR_LOG(sDragLm, PR_LOG_DEBUG,
- ("adding target %s with id %ld\n",
- target->target, atom));
-@@ -931,7 +931,7 @@
- (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
- plainTarget->target = g_strdup(kTextMime);
- plainTarget->flags = 0;
-- plainTarget->info = (guint)plainAtom;
-+ plainTarget->info = (guint)NS_PTR_TO_INT32(plainAtom);
- PR_LOG(sDragLm, PR_LOG_DEBUG,
- ("automatically adding target %s with \
- id %ld\n", plainTarget->target, plainAtom));
-@@ -948,7 +948,7 @@
- (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
- urlTarget->target = g_strdup(gMozUrlType);
- urlTarget->flags = 0;
-- urlTarget->info = (guint)urlAtom;
-+ urlTarget->info = (guint)NS_PTR_TO_INT32(urlAtom);
- PR_LOG(sDragLm, PR_LOG_DEBUG,
- ("automatically adding target %s with \
- id %ld\n", urlTarget->target, urlAtom));
+++ /dev/null
---- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.foo2 2005-06-20 13:12:24.000000000 -0400
-+++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 2005-06-20 10:16:59.000000000 -0400
-@@ -53,7 +53,6 @@
- #include "nsUnicharUtils.h"
- #include "nsQuickSort.h"
-
--#include <pango/pangoxft.h>
- #include <fontconfig/fontconfig.h>
- #include <gdk/gdk.h>
- #include <gdk/gdkx.h>
-@@ -301,12 +300,11 @@
-
- // Get our font face
- FT_Face face;
-+ face = pango_fc_font_lock_face(fcfont);
-+ if (!face)
-+ return NS_ERROR_NOT_AVAILABLE;
-+
- TT_OS2 *os2;
-- XftFont *xftFont = pango_xft_font_get_font(PANGO_FONT(fcfont));
-- if (!xftFont)
-- return NS_ERROR_NOT_AVAILABLE;
--
-- face = XftLockFace(xftFont);
- os2 = (TT_OS2 *) FT_Get_Sfnt_Table(face, ft_sfnt_os2);
-
- // mEmHeight (size in pixels of EM height)
-@@ -318,10 +316,12 @@
- mEmHeight = PR_MAX(1, nscoord(size * f));
-
- // mMaxAscent
-- mMaxAscent = nscoord(xftFont->ascent * f);
-+ val = MOZ_FT_TRUNC(face->size->metrics.ascender);
-+ mMaxAscent = NSToIntRound(val * f);
-
- // mMaxDescent
-- mMaxDescent = nscoord(xftFont->descent * f);
-+ val = -MOZ_FT_TRUNC(face->size->metrics.descender);
-+ mMaxDescent = NSToIntRound(val * f);
-
- nscoord lineHeight = mMaxAscent + mMaxDescent;
-
-@@ -341,7 +341,8 @@
- mEmDescent = mEmHeight - mEmAscent;
-
- // mMaxAdvance
-- mMaxAdvance = nscoord(xftFont->max_advance_width * f);
-+ val = MOZ_FT_TRUNC(face->size->metrics.max_advance);
-+ mMaxAdvance = NSToIntRound(val * f);
-
- // mPangoSpaceWidth
- PangoLayout *layout = pango_layout_new(mPangoContext);
-@@ -364,17 +365,16 @@
- mAveCharWidth = tmpWidth;
-
- // mXHeight (height of an 'x' character)
-- PRUnichar xUnichar('x');
-- XGlyphInfo extents;
-- if (FcCharSetHasChar(xftFont->charset, xUnichar)) {
-- XftTextExtents16(GDK_DISPLAY(), xftFont, &xUnichar, 1, &extents);
-- mXHeight = extents.height;
-+ if (pango_fc_font_has_char(fcfont, 'x')) {
-+ PangoRectangle rect;
-+ PangoGlyph glyph = pango_fc_font_get_glyph (fcfont, 'x');
-+ pango_font_get_glyph_extents (PANGO_FONT (fcfont), glyph, &rect, NULL);
-+ mXHeight = NSToIntRound(rect.height * f / PANGO_SCALE);
- }
- else {
- // 56% of ascent, best guess for non-true type or asian fonts
-- mXHeight = nscoord(((float)mMaxAscent) * 0.56);
-+ mXHeight = nscoord(((float)mMaxAscent) * 0.56 * f);
- }
-- mXHeight = nscoord(mXHeight * f);
-
- // mUnderlineOffset (offset for underlines)
- val = CONVERT_DESIGN_UNITS_TO_PIXELS(face->underline_position,
-@@ -384,7 +394,8 @@
- }
- else {
- mUnderlineOffset =
-- -NSToIntRound(PR_MAX(1, floor(0.1 * xftFont->height + 0.5)) * f);
-+ -NSToIntRound(PR_MAX(1, floor(0.1 *
-+ MOZ_FT_TRUNC(face->size->metrics.height) + 0.5)) * f);
- }
-
- // mUnderlineSize (thickness of an underline)
-@@ -395,7 +406,8 @@
- }
- else {
- mUnderlineSize =
-- NSToIntRound(PR_MAX(1, floor(0.05 * xftFont->height + 0.5)) * f);
-+ NSToIntRound(PR_MAX(1,
-+ floor(0.05 * MOZ_FT_TRUNC(face->size->metrics.height) + 0.5)) * f);
- }
-
- // mSuperscriptOffset
-@@ -426,7 +438,7 @@
- // mStrikeoutSize
- mStrikeoutSize = mUnderlineSize;
-
-- XftUnlockFace(xftFont);
-+ pango_fc_font_unlock_face(fcfont);
-
- /*
- printf("%i\n", mXHeight);
-@@ -893,7 +905,7 @@
- {
- if (aIsRTL) {
- if (!mRTLPangoContext) {
-- mRTLPangoContext = pango_xft_get_context(GDK_DISPLAY(), 0);
-+ mRTLPangoContext = gdk_pango_context_get();
- pango_context_set_base_dir(mRTLPangoContext, PANGO_DIRECTION_RTL);
-
- gdk_pango_context_set_colormap(mRTLPangoContext, gdk_rgb_get_cmap());
-@@ -1163,7 +1175,7 @@
- NS_ConvertUCS2toUTF8 name(aName);
-
- nsresult rv = NS_ERROR_FAILURE;
-- PangoContext *context = pango_xft_get_context(GDK_DISPLAY(), 0);
-+ PangoContext *context = gdk_pango_context_get();
- PangoFontFamily **familyList;
- int n;
-
-@@ -1262,7 +1274,7 @@
-
- // Now that we have the font description set up, create the
- // context.
-- mLTRPangoContext = pango_xft_get_context(GDK_DISPLAY(), 0);
-+ mLTRPangoContext = gdk_pango_context_get();
- mPangoContext = mLTRPangoContext;
-
- // Make sure to set the base direction to LTR - if layout needs to
projects / packages / firefox.git / commitdiff