[SOLVED] Unable to compile GIT verion with freetype-2.5.4

Questions, problems and discussion about compiling FreeOrion.

Moderator: Oberlus

Message
Author
User avatar
asm64
Space Floater
Posts: 27
Joined: Fri Jan 31, 2014 6:57 am

Re: [SOLVED] Unable to compile GIT verion with freetype-2.5.

#16 Post by asm64 »

Geoff the Medio wrote:I can't apply that patch using TortoiseSVN...
I think it because I used diff incorrectly

Code: Select all

--- Font.cpp	2014-12-29 23:20:52.873936772 +0700
+++ Font.cpp.new	2014-12-30 16:49:08.110769984 +0700
In another patches something like ))

Code: Select all

--- GG/src/Font.cpp   (revision 7806)
+++ GG/src/Font.cpp   (working copy)
I should figure out how to use "diff"

Thanks for apply changes and happy New Year!

User avatar
Dilvish
AI Lead and Programmer Emeritus
Posts: 4768
Joined: Sat Sep 22, 2012 6:25 pm

Re: [SOLVED] Unable to compile GIT verion with freetype-2.5.

#17 Post by Dilvish »

asm64 wrote:I should figure out how to use "diff"
It's an svn command:

Code: Select all

svn diff
that gives a patch file with the headings like

Code: Select all

--- GG/src/Font.cpp   (revision 7806)
+++ GG/src/Font.cpp   (working copy)
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0

Chriss
Dyson Forest
Posts: 231
Joined: Sun May 11, 2008 10:50 am

Re: [SOLVED] Unable to compile GIT verion with freetype-2.5.

#18 Post by Chriss »

It looks like Arch Linux needs that patch too (freetype 2.55). Apart from some line ending issues, I'm trying it atm and it did get past compiling Font.cpp, with only warnings about compares of unsigned and signed ints.
It is a bit strange in that I only have this issue when using the Aur Package, not when I compile the PKGBUILD that creates the package manually, but oh my...

So can this change be comitted?
Attached patches are released under GPL 2.0 or later.

Post Reply