Project

Profile

Help

HostedRedmine.com has moved to the Planio platform. All logins and passwords remained the same. All users will be able to login and use Redmine just as before. Read more...
Send by e-mail

Feature #754206

Use pkg-config to find freetype

Added by Lars Wendler over 3 years ago. Updated over 3 years ago.

Status:
Closed
Priority:
Normal
Assignee:
Marko Lindqvist
Category:
Bootstrap
Sprint/Milestone:
2.6.1
Start date:
Due date:
% Done:

0%

Estimated time:

Description

As of freetype-2.9.1 the freetype-config script no longer gets installed
by default.

See also "Make installation of `freetype-config' optional" (http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=a7833f26c4ac45cafe1dffdcd7f7dcfd6493161c) commit by freetype upstream.

The master branch already contains nearly the same code although doing the version check wrong. freetype uses the libtool specific version numbers in its `freetyp2.pc` file.
See http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT

I also filed a git pull request: https://github.com/freeciv/freeciv/pull/11

0001-Use-pkg-config-to-find-freetype.patch (7.59 KB) 0001-Use-pkg-config-to-find-freetype.patch Lars Wendler, 2018-05-17 12:31 PM
0001-Use-pkg-config-to-find-freetype.patch (7.93 KB) 0001-Use-pkg-config-to-find-freetype.patch Lars Wendler, 2018-07-16 05:42 AM
0005-Use-pkg-config-to-find-freetype.patch (7.9 KB) 0005-Use-pkg-config-to-find-freetype.patch Marko Lindqvist, 2018-07-21 12:04 AM

History

#1 Updated by Lars Wendler over 3 years ago

Forgot to mention, this is for the S2_5 branch. The current master branch already uses pkg-config to find freetype.

#2 Updated by Marko Lindqvist over 3 years ago

  • Category set to Bootstrap
  • Sprint/Milestone set to 2.6.1

Not targeting to S2_5. Set target version to 2.6.1 for now, though would accept to 2.6.0 if it makes it before last RC (presumably RC2 next weekend).

Makefile.am should not list removed freetype2.m4 for inclusion to tarball.

#3 Updated by Marko Lindqvist over 3 years ago

Marko Lindqvist wrote:

Makefile.am should not list removed freetype2.m4 for inclusion to tarball.

Will you send an updated version?

#4 Updated by Lars Wendler over 3 years ago

Here is the updated patch. It's also available in the GitHub pull request.

#5 Updated by Marko Lindqvist over 3 years ago

Lars Wendler wrote:

doing the version check wrong.

-> Bug #765927

#6 Updated by Marko Lindqvist over 3 years ago

- Ported to S2_6
- Added reference to this ticket to the commit message

#7 Updated by Marko Lindqvist over 3 years ago

  • Status changed from Resolved to Closed
  • Assignee set to Marko Lindqvist

#8 Updated by Marko Lindqvist over 3 years ago

To clarify: This affected sdl-client only. sdl2-client's bootstrap's freetype detection has been based on pkg-config from the beginning.

Send by e-mail

Also available in: Atom PDF