Removed some not required changes which can break trunk build
Removed empty lines changes
--- a/client.mk
+++ b/client.mk
@@ -88,17 +88,17 @@ ifeq (,$(wildcard client.mk))
$(error Must run from the client.mk directory, or specify TOPSRCDIR)
endif
TOPSRCDIR = $(CWD)
endif
ifeq (Darwin,$(shell uname -s))
AUTOCONF ?= autoconf213
else
-AUTOCONF ?= autoconf-2.13
+AUTOCONF ?= $(shell which autoconf-2.13 autoconf2.13 autoconf213 | head -1)
endif
MKDIR := mkdir
SH := /bin/sh
ifndef MAKE
MAKE := gmake
endif
PERL ?= perl
--- a/gfx/cairo/cairo/src/cairo-platform.h
+++ b/gfx/cairo/cairo/src/cairo-platform.h
@@ -62,17 +62,17 @@
# elif defined(XP_OS2)
# ifdef __declspec
# define cairo_public extern __declspec(dllexport)
# else
# define cairo_public extern
# endif
# else
# ifdef HAVE_VISIBILITY_ATTRIBUTE
-# define cairo_public
+# define cairo_public extern __attribute__((visibility("default")))
# elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
# define cairo_public extern __global
# else
# define cairo_public extern
# endif
# endif
#endif
--- a/gfx/src/thebes/nsThebesDeviceContext.cpp
+++ b/gfx/src/thebes/nsThebesDeviceContext.cpp
@@ -222,16 +222,17 @@ nsThebesDeviceContext::SetDPI()
DevCloseDC(dc);
}
if (dpi < 0) // something didn't work before, fall back to hardcoded DPI value
dpi = 96;
#elif defined(XP_MACOSX)
// we probably want to actually get a real DPI here?
dpi = 96;
+
#elif defined(MOZ_WIDGET_QT)
// TODO: get real DPI here with Qt methods
dpi = 96;
#else
#error undefined platform dpi
#endif
if (prefDPI > 0 && !mPrintingSurface)
--- a/gfx/thebes/src/gfxFontconfigUtils.cpp
+++ b/gfx/thebes/src/gfxFontconfigUtils.cpp
@@ -306,17 +306,16 @@ gfxFontconfigUtils::UpdateFontListIntern
}
if (mAliasForMultiFonts.Count() == 0)
return NS_OK;
for (PRInt32 i = 0; i < mAliasForMultiFonts.Count(); i++) {
nsRefPtr<gfxFontNameList> fonts = new gfxFontNameList;
nsCAutoString fontname(*mAliasForMultiFonts.CStringAt(i));
- printf("Alias %s\n", fontname.get());
rv = GetResolvedFonts(fontname, fonts);
if (NS_FAILED(rv))
return rv;
nsCAutoString key;
ToLowerCase(fontname, key);
mAliasTable.Put(key, fonts);
}