From: Markus Koschany <apo@debian.org>
Date: Thu, 8 Mar 2018 17:49:24 +0100
Subject: pkg-config

Use pkg-config instead of the deprecated freetype-config command.

Bug-Debian: https://bugs.debian.org/892338
Forwarded: no
---
 src/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3b7d0fe..0f5a5dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -158,8 +158,8 @@ endif
 SDL_CFLAGS = `sdl-config --cflags`
 SDL_LIBS   = `sdl-config --libs`
 
-FREETYPE_CFLAGS = `freetype-config --cflags`
-FREETYPE_LIBS   = `freetype-config --libs`
+FREETYPE_CFLAGS = `pkg-config --cflags freetype2`
+FREETYPE_LIBS   = `pkg-config --libs freetype2`
 
 if USE_MATHSINGLE
 MATH_CFLAGS = -DVMATH_SINGLE_PRECISION
@@ -233,4 +233,4 @@ AM_CFLAGS = -Wall ${FREETYPE_CFLAGS} ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLA
             ${OPTIMIZATION_CFLAGS} ${USESSE_CFLAGS} ${USEWIN_CFLAGS} ${FASTMATH_CFLAGS} ${DEBIAN_CFLAGS} -lm
 
 AM_LDFLAGS = ${all_libraries} ${FREETYPE_LIBS} ${SDL_LIBS}
-LDADD = ${LDADD_FLAGS}
\ No newline at end of file
+LDADD = ${LDADD_FLAGS}
472db4ae2176607b8'>refs</a><a class='active' href='/guix/log/tests/guix-environment.sh'>log</a><a href='/guix/tree/tests/guix-environment.sh?id=48e7653fef493d05a0f7a0b472db4ae2176607b8'>tree</a><a href='/guix/commit/tests/guix-environment.sh?id=48e7653fef493d05a0f7a0b472db4ae2176607b8'>commit</a><a href='/guix/diff/tests/guix-environment.sh?id=48e7653fef493d05a0f7a0b472db4ae2176607b8'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-environment.sh'>
<input type='hidden' name='id' value='48e7653fef493d05a0f7a0b472db4ae2176607b8'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=48e7653fef493d05a0f7a0b472db4ae2176607b8'>root</a>/<a href='/guix/log/tests?id=48e7653fef493d05a0f7a0b472db4ae2176607b8'>tests</a>/<a href='/guix/log/tests/guix-environment.sh?id=48e7653fef493d05a0f7a0b472db4ae2176607b8'>guix-environment.sh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/guix-environment.sh?id=48e7653fef493d05a0f7a0b472db4ae2176607b8&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-10-31 14:49:47 +0200'>2021-10-31</span></td><td><a href='/guix/commit/tests/guix-environment.sh?id=bc5155b952ae8bdbc56aded4d8d39768b4e2a7d4'>Merge remote-tracking branch 'origin/master' into core-updates-frozen</a></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-10-25 19:02:32 +0200'>2021-10-25</span></td><td><a href='/guix/commit/tests/guix-environment.sh?id=10208952eaf0834b9cdf341bc75463ed033af315'>environment: Add tests for '--profile'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to a643deac2de81755a1843a3b41dd53857678bebc.

* tests/guix-environment-container.sh, tests/guix-environment.sh: Add
tests for '--profile'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-07-11 00:46:54 +0200'>2021-07-11</span></td><td><a href='/guix/commit/tests/guix-environment.sh?id=2a3cd4ee3557fbbdca42b5ec2f3ec4546c270203'>environment: Adjust to earlier 'gcc-bootstrap' search paths changes.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to fe6775f52b7f28a5bf74633ea4737c32a64b7e05.

* tests/guix-environment.sh: Expect C_INCLUDE_PATH rather than CPATH in
environment containing 'gcc-bootstrap'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-01-19 17:45:38 +0100'>2021-01-19</span></td><td><a href='/guix/commit/tests/guix-environment.sh?id=4d79f072cc7b502fc25486d514c9200ba684a596'>environment: Fix '--root' option with relative file name.</a><span class='msg-avail'>...<span class='msg-tooltip'>The path normalization of `--root` option of `guix environment` was
buggy as it appended full argument after normalized directory. This
patch fixes it.

* guix/scripts/environment.scm (register-gc-root): Fix gc-root path
normalization.
* tests/guix-environment.sh: Add test.

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>JOULAUD François</td></tr>
='msg-avail'>...<span class='msg-tooltip'>* gnu/services/file-sharing.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* po/packages/POTFILES.in: Add it.
* tests/services/file-sharing.scm: New file.
* Makefile.am (SCM_TESTS): Add it.
* doc/guix.texi (File-Sharing Services): New section.

Signed-off-by: 宋文武 &lt;iyzsong@member.fsf.org&gt;
</span></span></td><td>Simon South</td></tr>
<tr><td><span title='2020-08-02 15:54:37 +0300'>2020-08-02</span></td><td><a href='/guix/commit/tests/services?id=587e0d911dfff81647015e89847084b606e68f71'>services: Add zram-device-service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/linux.scm (&lt;zram-device-configuration&gt;): New record.
(zram-device-service-type): New variable.
* doc/guix.texi (Linux Services): Document it.
* tests/services/linux.scm (zram-swap-device-test): New tests.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2020-01-31 23:37:13 -0500'>2020-01-31</span></td><td><a href='/guix/commit/tests/services?id=d3e439e355284f136ff13eb3e6fffb4661552f3b'>gnu: Add earlyoom-service-type.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/linux.scm: New file.
* tests/services/linux.scm: Add test.
* Makefile.am (SCM_TESTS): Register test.
* doc/guix.texi (Linux Services): Add a new section and document the new
service and its configuration.
</span></span></td><td>Maxim Cournoyer</td></tr>