Bug 68229

Summary: [GTK] Linker error with double inclusion of ScrollbarThemeMock.cpp
Product: WebKit Reporter: Wajahat Siddiqui <mdwajahatali.siddiqui>
Component: WebKitGTKAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: amruthraj, mrobinson, simon.fraser
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Other   
OS: Linux   
Attachments:
Description Flags
linker error fix
none
linker error fix updated changelog none

Description Wajahat Siddiqui 2011-09-16 01:03:24 PDT
Gtk build is broken on svn rev# 95275 as ScrollbarThemeMock.cpp is mistakenly included twice in Source/WebCore/GNUmakefile.list.am. 
This is added from attachment committed from https://bugs.webkit.org/show_bug.cgi?id=68134
--- a/Source/WebCore/GNUmakefile.list.am
+++ b/Source/WebCore/GNUmakefile.list.am
@@ -2686,6 +2686,8 @@ webcore_sources += \
 	Source/WebCore/platform/mock/GeolocationClientMock.h \
 	Source/WebCore/platform/mock/GeolocationServiceMock.cpp \
 	Source/WebCore/platform/mock/GeolocationServiceMock.h \
+	Source/WebCore/platform/mock/ScrollbarThemeMock.cpp \
+	Source/WebCore/platform/mock/ScrollbarThemeMock.cpp \
 	Source/WebCore/platform/mock/SpeechInputClientMock.cpp \
 	Source/WebCore/platform/mock/SpeechInputClientMock.h \
 	Source/WebCore/platform/network/AuthenticationChallengeBase.cpp \

Attached patch corrects this issue
Comment 1 Wajahat Siddiqui 2011-09-16 01:12:43 PDT
Created attachment 107619 [details]
linker error fix

fixing this issue by removing double inclusion.
Comment 2 Wajahat Siddiqui 2011-09-16 01:19:43 PDT
Created attachment 107620 [details]
linker error fix updated changelog

updating changelog
Comment 3 Alejandro G. Castro 2011-09-16 01:39:24 PDT
Comment on attachment 107620 [details]
linker error fix updated changelog

View in context: https://bugs.webkit.org/attachment.cgi?id=107620&action=review

Thanks for the patch but I've already fixed the issue http://trac.webkit.org/changeset/95280, this kind of patches do not need review. Could you remove the r? tag?

> Source/WebCore/GNUmakefile.list.am:-2688
> -	Source/WebCore/platform/mock/ScrollbarThemeMock.cpp \

I think we do not have to remove the line but change .cpp for .h.
Comment 4 Wajahat Siddiqui 2011-09-16 02:19:35 PDT
fixed in http://trac.webkit.org/changeset/95280
Comment 5 Wajahat Siddiqui 2011-09-16 02:22:12 PDT
fixed in http://trac.webkit.org/changeset/95280
Comment 6 Simon Fraser (smfr) 2011-09-16 08:42:24 PDT
Thanks for fixing!