The files src\libgdl\gdl-win32.c src\libgdl\gdl-win32.h seems to be missing from the last compound patch rygle sent. I think the easiest way to create a big patch file is to just
c:\RELEASE_0_46_BRANCH\packaging\win32\patches>type 01*.patch > all.patch c:\RELEASE_0_46_BRANCH\packaging\win32\patches>type 02*.patch >> all.patch c:\RELEASE_0_46_BRANCH\packaging\win32\patches>type 03*.patch >> all.patch c:\RELEASE_0_46_BRANCH\packaging\win32\patches>type 05*.patch >> all.patch that is no number 4...
I have tried to clean and compile myself again, and when I apply the 03_vista_turn_off_dashes.patch correctly it compiles on my Vista machine.
Any gdl-win32.c:62: error: redefinition of 'is_os_vista' src/libgdl/gdl-win32.c:20: error: previous definition of 'is_os_vista' was here kind of errors is because the src\libgdl\gdl-win32.c src\libgdl\gdl-win32.h files gets patched several times and then contains the method definifinitions several times. If that happen, remove all but the first definition (43 lines should remain in gdl-win32.c)
rygle skrev:
After fixing the patch and trying to build again, I'm getting the same build error relating to patch 3 - "03_vista_turn_off_dashes.patch", which is a fix for bug 183646.
If you're able, you may want to help Albin and others figure out the problem.
In the meantime if you're trying to build on windows either don't apply patch 3, or using the master patch file and Tortoise, don't select the 3 gdl related patches;
- src\libgdl\gdl-dock-master.c
- src\libgdl\gdl-win32.c
- src\libgdl\gdl-win32.h
If you try to revert using Tortoise, it won't show anything for the last two, because they are complete new files rather than patches to existing files in the codebase. Therefore Tortoise doesn't consider that those files have changed from the codebase. You will have to delete or rename them yourself.
Rename is not good, since the renamed files will be built also, delete (or move far away from the src-tree) is the only working thing to do.
// Albin