servo: gfx: Rename servo-gfx-2 to servo-gfx

Source-Repo: https://github.com/servo/servo
Source-Revision: 7bbff6154ccab3b6d36cbc61b497e4e0f56341b8

--HG--
rename : servo/src/servo-gfx-2/JosefinSans-SemiBold.ttf => servo/src/servo-gfx/JosefinSans-SemiBold.ttf
rename : servo/src/servo-gfx-2/OFL.txt => servo/src/servo-gfx/OFL.txt
rename : servo/src/servo-gfx-2/color.rs => servo/src/servo-gfx/color.rs
rename : servo/src/servo-gfx-2/compositor.rs => servo/src/servo-gfx/compositor.rs
rename : servo/src/servo-gfx-2/display_list.rs => servo/src/servo-gfx/display_list.rs
rename : servo/src/servo-gfx-2/font.rs => servo/src/servo-gfx/font.rs
rename : servo/src/servo-gfx-2/font_context.rs => servo/src/servo-gfx/font_context.rs
rename : servo/src/servo-gfx-2/font_list.rs => servo/src/servo-gfx/font_list.rs
rename : servo/src/servo-gfx-2/fontconfig/font_list.rs => servo/src/servo-gfx/fontconfig/font_list.rs
rename : servo/src/servo-gfx-2/freetype/font.rs => servo/src/servo-gfx/freetype/font.rs
rename : servo/src/servo-gfx-2/freetype/font_context.rs => servo/src/servo-gfx/freetype/font_context.rs
rename : servo/src/servo-gfx-2/geometry.rs => servo/src/servo-gfx/geometry.rs
rename : servo/src/servo-gfx-2/image/base.rs => servo/src/servo-gfx/image/base.rs
rename : servo/src/servo-gfx-2/image/encode/tga.rs => servo/src/servo-gfx/image/encode/tga.rs
rename : servo/src/servo-gfx-2/image/holder.rs => servo/src/servo-gfx/image/holder.rs
rename : servo/src/servo-gfx-2/image/test.jpeg => servo/src/servo-gfx/image/test.jpeg
rename : servo/src/servo-gfx-2/native.rs => servo/src/servo-gfx/native.rs
rename : servo/src/servo-gfx-2/opts.rs => servo/src/servo-gfx/opts.rs
rename : servo/src/servo-gfx-2/quartz/font.rs => servo/src/servo-gfx/quartz/font.rs
rename : servo/src/servo-gfx-2/quartz/font_context.rs => servo/src/servo-gfx/quartz/font_context.rs
rename : servo/src/servo-gfx-2/quartz/font_list.rs => servo/src/servo-gfx/quartz/font_list.rs
rename : servo/src/servo-gfx-2/render_context.rs => servo/src/servo-gfx/render_context.rs
rename : servo/src/servo-gfx-2/render_layers.rs => servo/src/servo-gfx/render_layers.rs
rename : servo/src/servo-gfx-2/render_task.rs => servo/src/servo-gfx/render_task.rs
rename : servo/src/servo-gfx-2/resource/file_loader.rs => servo/src/servo-gfx/resource/file_loader.rs
rename : servo/src/servo-gfx-2/resource/http_loader.rs => servo/src/servo-gfx/resource/http_loader.rs
rename : servo/src/servo-gfx-2/resource/image_cache_task.rs => servo/src/servo-gfx/resource/image_cache_task.rs
rename : servo/src/servo-gfx-2/resource/local_image_cache.rs => servo/src/servo-gfx/resource/local_image_cache.rs
rename : servo/src/servo-gfx-2/resource/resource_task.rs => servo/src/servo-gfx/resource/resource_task.rs
rename : servo/src/servo-gfx-2/servo_gfx.rc => servo/src/servo-gfx/servo_gfx.rc
rename : servo/src/servo-gfx-2/servo_gfx.rs => servo/src/servo-gfx/servo_gfx.rs
rename : servo/src/servo-gfx-2/surface.rs => servo/src/servo-gfx/surface.rs
rename : servo/src/servo-gfx-2/text.rs => servo/src/servo-gfx/text.rs
rename : servo/src/servo-gfx-2/text/glyph.rs => servo/src/servo-gfx/text/glyph.rs
rename : servo/src/servo-gfx-2/text/harfbuzz/shaper.rs => servo/src/servo-gfx/text/harfbuzz/shaper.rs
rename : servo/src/servo-gfx-2/text/shaper.rs => servo/src/servo-gfx/text/shaper.rs
rename : servo/src/servo-gfx-2/text/text_run.rs => servo/src/servo-gfx/text/text_run.rs
rename : servo/src/servo-gfx-2/text/util.rs => servo/src/servo-gfx/text/util.rs
rename : servo/src/servo-gfx-2/util/cache.rs => servo/src/servo-gfx/util/cache.rs
rename : servo/src/servo-gfx-2/util/range.rs => servo/src/servo-gfx/util/range.rs
rename : servo/src/servo-gfx-2/util/time.rs => servo/src/servo-gfx/util/time.rs
rename : servo/src/servo-gfx-2/util/url.rs => servo/src/servo-gfx/util/url.rs
rename : servo/src/servo-gfx-2/util/vec.rs => servo/src/servo-gfx/util/vec.rs

servo/Makefile.in

@@ -133,13 +133,13 @@ $(eval $(call DEF_SUBMODULE_RULES,$(submodule))))
 DONE_SUBMODULES = $(foreach dep,$(DEPS_SUBMODULES),$(DONE_$(dep)))
 
 RFLAGS_servo_gfx = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES))
-SRC_servo_gfx = $(call rwildcard,$(S)src/servo-gfx-2/,*.rs)
-CRATE_servo_gfx = $(S)src/servo-gfx-2/servo_gfx.rc
-DONE_servo_gfx = $(B)src/servo-gfx-2/libservogfx.dummy
+SRC_servo_gfx = $(call rwildcard,$(S)src/servo-gfx/,*.rs)
+CRATE_servo_gfx = $(S)src/servo-gfx/servo_gfx.rc
+DONE_servo_gfx = $(B)src/servo-gfx/libservogfx.dummy
 
 DEPS_servo_gfx = $(CRATE_servo_gfx) $(SRC_servo_gfx) $(DONE_SUBMODULES)
 
-RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/servo-gfx-2
+RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/servo-gfx
 SRC_servo = $(call rwildcard,$(S)src/servo/,*.rs)
 CRATE_servo = $(S)src/servo/servo.rc
 

servo/configure

@@ -365,7 +365,7 @@ do
     make_dir ${CFG_BUILD_DIR}src/${i}
 done
 
-make_dir ${CFG_BUILD_DIR}src/servo-gfx-2
+make_dir ${CFG_BUILD_DIR}src/servo-gfx
 make_dir src/test/ref
 
 # TODO: don't run configure on submodules unless necessary. For an example,

servo/mk/sub.mk

@@ -95,7 +95,7 @@ DEPS_rust-cairo += \
 	rust-core-graphics \
 	$(NULL)
 
-dEPS_rust-io-surface += \
+DEPS_rust-io-surface += \
 	rust-core-foundation \
 	$(NULL)