You need to merge cursor.patch manually. During the development, my
xemacs changed indent and caused these conflicts in the
WindowManagerService.java with new checkouts. You can look at the patch
and merge them manually. I will create new patch as soon as I got free
time.
On Sun, 2009-05-03 at 23:45 -0700, adhi wrote:
> Hi !
>
> I am following the steps mentioned in this forum and I am the stage of
> applying patches. All the patches namely,
> alarm.patch, boot_able_img.patch, cursor.patch, e2fsprogs.patch and
> frameworks.patch are okay except the cursor.patch.
>
> Following is the output ,
>
> varadara...@thinteknix:~/Desktop/mydroid/frameworks/base$ git apply --
> reject --whitespace=fix ~/Desktop/x86-patches/cursor.patch
> /home/varadarajan/Desktop/x86-patches/cursor.patch:38: trailing
> whitespace.
> if (test_bit(BTN_LEFT,key_bitmask) &&
> /home/varadarajan/Desktop/x86-patches/cursor.patch:78: trailing
> whitespace.
> (di, di.mDownTime, curTime,
> /home/varadarajan/Desktop/x86-patches/cursor.patch:80: trailing
> whitespace.
> ((ev.flags &
> /home/varadarajan/Desktop/x86-patches/cursor.patch:81: trailing
> whitespace.
>
> WindowManagerPolicy.FLAG_WOKE_HERE)
> /home/varadarajan/Desktop/x86-patches/cursor.patch:92: trailing
> whitespace.
> ((classes&RawInputEvent.CLASS_MOUSE) !
> = 0))) {
> Checking patch core/java/android/view/RawInputEvent.java...
> Checking patch include/ui/EventHub.h...
> Checking patch libs/ui/EventHub.cpp...
> Checking patch services/java/com/android/server/KeyInputQueue.java...
> Checking patch services/java/com/android/server/
> WindowManagerService.java...
> error: while searching for:
> int eventType;
> if (ev.classType ==
> RawInputEvent.CLASS_TOUCHSCREEN) {
> eventType = eventType((MotionEvent)
> ev.event);
> } else if (ev.clas
> error: patch failed: services/java/com/android/server/
> WindowManagerService.java:5079
> Applied patch core/java/android/view/RawInputEvent.java cleanly.
> Applied patch include/ui/EventHub.h cleanly.
> Applied patch libs/ui/EventHub.cpp cleanly.
> Applied patch services/java/com/android/server/KeyInputQueue.java
> cleanly.
> Applying patch services/java/com/android/server/
> WindowManagerService.java with 1 rejects...
> Hunk #1 applied cleanly.
> Hunk #2 applied cleanly.
> Hunk #3 applied cleanly.
> Hunk #4 applied cleanly.
> Hunk #5 applied cleanly.
> Hunk #6 applied cleanly.
> Hunk #7 applied cleanly.
> Hunk #8 applied cleanly.
> Hunk #9 applied cleanly.
> Rejected hunk #10.
> Hunk #11 applied cleanly.
> varadara...@thinteknix:~/Desktop/mydroid/frameworks/base$
>
> Any idea why this is happening ? Is this okay or to be ignored ?
>
> Cheers
> Varadarajan
> Ottawa
> www.thinteknix.com
>
> >
--~--~---------~--~----~------------~-------~--~----~
unsubscribe: android-porting+unsubscr...@googlegroups.com
website: http://groups.google.com/group/android-porting
-~----------~----~----~----~------~----~------~--~---
