From a0a312b5855eebe0c0107f14fd582558b33d707b Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 2 May 2012 14:05:46 -0400
Subject: [PATCH] Bug 751186 - Rip out qcms from libxul; r=khuey

Landed on a CLOSED TREE
---
 layout/media/Makefile.in    |  2 +-
 layout/media/symbols.def.in | 14 ++++++++++++++
 toolkit/library/Makefile.in |  1 -
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/layout/media/Makefile.in b/layout/media/Makefile.in
index c3eff7004a3..e0d4fec2b3f 100644
--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@@ -49,7 +49,7 @@ ifeq (WINNT,$(OS_TARGET))
 FORCE_SHARED_LIB = 1
 endif
 
-SHARED_LIBRARY_LIBS = $(MOZ_OTS_LIBS)
+SHARED_LIBRARY_LIBS = $(MOZ_OTS_LIBS) $(QCMS_LIBS)
 
 ifdef MOZ_GRAPHITE
 SHARED_LIBRARY_LIBS += $(MOZ_GRAPHITE_LIBS)
diff --git a/layout/media/symbols.def.in b/layout/media/symbols.def.in
index de30819a9b9..dcbedcc2c82 100644
--- a/layout/media/symbols.def.in
+++ b/layout/media/symbols.def.in
@@ -191,3 +191,17 @@ jpeg_start_output
 jpeg_std_error
 jpeg_write_scanlines
 #endif
+qcms_enable_iccv4
+qcms_profile_create_rgb_with_gamma
+qcms_profile_from_memory
+qcms_profile_from_path
+qcms_profile_from_unicode_path
+qcms_profile_get_color_space
+qcms_profile_get_rendering_intent
+qcms_profile_is_bogus
+qcms_profile_precache_output_transform
+qcms_profile_release
+qcms_profile_sRGB
+qcms_transform_create
+qcms_transform_data
+qcms_transform_release
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 0a5073edddb..ba4df6e434b 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -333,7 +333,6 @@ endif
 
 EXTRA_DSO_LDOPTS += \
   $(LIBS_DIR) \
-  $(QCMS_LIBS) \
   $(MOZ_JS_LIBS) \
   $(NSS_LIBS) \
   $(MOZ_CAIRO_LIBS) \