Bug 68000

Summary:

WebCore.gypi references moved file FontGtk.cpp

Product:

WebKit

Reporter:

Erik Wright <erikwright>

Component:

WebCore Misc.

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

webkit.review.bot

Priority:

Version:

528+ (Nightly build)

Hardware:

All

OS:

All

Attachments:

Description	Flags
Patch	none
Patch	none

Erik Wright

Reported 2011-09-13 06:46:58 PDT

While updating a Chromium working directory I encountered the following errors: --------- S:\src\chromium\src>gclient sync ... ________ running 'svn update S:\src\chromium\src\third_party\WebKit\Source --rev ision 94949 --force --ignore-externals' in 'S:\src\chromium' At revision 94949. ... Enabled Psyco JIT. Updating projects from gyp files... Error: Missing input file src\chrome\browser\policy\configuration_policy_store_interface.h Error: Missing input file src\third_party\WebKit\Source\WebCore\WebCore.gyp\..\platform\graphics\gtk\FontGtk.cpp Error: Missing input file src\third_party\WebKit\Source\WebCore\WebCore.gyp\..\platform\graphics\gtk\FontGtk.cpp Error: Missing input file src\third_party\WebKit\Source\WebCore\WebCore.gyp\..\platform\graphics\gtk\FontGtk.cpp Error: Missing input file src\third_party\WebKit\Source\WebCore\WebCore.gyp\..\platform\graphics\gtk\FontGtk.cpp S:\src\chromium\src>gclient sync --------- In revision 94874 the file was renamed: --------- r94874 | commit-queue@webkit.org | 2011-09-09 17:40:04 -0400 (Fri, 09 Sep 2011) | 13 lines Changed paths: M /trunk/Source/WebCore/ChangeLog M /trunk/Source/WebCore/GNUmakefile.list.am D /trunk/Source/WebCore/platform/graphics/gtk/FontGtk.cpp A /trunk/Source/WebCore/platform/graphics/pango/FontPango.cpp (from /trunk/Source/WebCore/platform/graphics/gtk/FontGtk.cpp:94873) Rename FontGtk.cpp to FontPango.cpp --------- But as of now /trunk/Source/WebCore/WebCore.gypi still references the file. It's simple to remove the stale reference but not as clear whether the new file should be added.

Attachments
Patch (1.78 KB, patch) 2011-09-13 07:40 PDT, Erik Wright	no flags	Details Formatted Diff Diff
Patch (1.78 KB, patch) 2011-09-13 07:52 PDT, Erik Wright	no flags	Details Formatted Diff Diff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.

Erik Wright

Comment 1 2011-09-13 06:54:50 PDT

The change to GNUMakefiles.list.am adds FontPango.cpp to webcoregtk if Pango is enabled. The other files that depend on Pango are included in WebCore.gypi (in webcore_files list) as are the other files unconditionally included in webcoregtk. Therefore I infer that it is correct that FontPango.cpp be included in the webcore_files list in WebCore.gypi

Erik Wright

Comment 2 2011-09-13 07:40:48 PDT

Created attachment 107175 [details] Patch

Erik Wright

Comment 3 2011-09-13 07:52:02 PDT

Created attachment 107177 [details] Patch

WebKit Review Bot

Comment 4 2011-09-13 09:22:55 PDT

Comment on attachment 107177 [details] Patch Clearing flags on attachment: 107177 Committed r95029: <http://trac.webkit.org/changeset/95029>

WebKit Review Bot

Comment 5 2011-09-13 09:22:59 PDT

All reviewed patches have been landed. Closing bug.

Note You need to log in before you can comment on or make changes to this bug.