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}
e15eefa80c2804e487025507fe3b1'>refs</a><a class='active' href='/guix/log/gnu/services/security-token.scm'>log</a><a href='/guix/tree/gnu/services/security-token.scm?id=e287a0e402ee15eefa80c2804e487025507fe3b1'>tree</a><a href='/guix/commit/gnu/services/security-token.scm?id=e287a0e402ee15eefa80c2804e487025507fe3b1'>commit</a><a href='/guix/diff/gnu/services/security-token.scm?id=e287a0e402ee15eefa80c2804e487025507fe3b1'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/security-token.scm'>
<input type='hidden' name='id' value='e287a0e402ee15eefa80c2804e487025507fe3b1'/><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=e287a0e402ee15eefa80c2804e487025507fe3b1'>root</a>/<a href='/guix/log/gnu?id=e287a0e402ee15eefa80c2804e487025507fe3b1'>gnu</a>/<a href='/guix/log/gnu/services?id=e287a0e402ee15eefa80c2804e487025507fe3b1'>services</a>/<a href='/guix/log/gnu/services/security-token.scm?id=e287a0e402ee15eefa80c2804e487025507fe3b1'>security-token.scm</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/gnu/services/security-token.scm?id=e287a0e402ee15eefa80c2804e487025507fe3b1&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-06-25 01:43:08 +0530'>2022-06-25</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=037bfd85458dd0b32a6dd85b7c12e85e3dd716ae'>services: pcscd: Use switch-symlinks from (guix build utils).</a><span class='msg-avail'>...<span class='msg-tooltip'>switch-symlinks has been moved to (guix build utils). We need not duplicate it
anymore.

* gnu/services/security-token.scm (pcscd-activation): Use switch-symlinks
from (guix build utils).
</span></span></td><td>Arun Isaac</td></tr>
<tr><td><span title='2021-07-03 20:13:42 +0200'>2021-07-03</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=e789ce538ed848bacb8f4eb5742f78b965ccf57c'>services: pcscd: Fix daemon signal handling.</a><span class='msg-avail'>...<span class='msg-tooltip'>"pcscd" wouldn't handle SIGTERM as it inherit ignoring this signal (and
others) from its parent shepherd; fork+exec-command restore signal
handling.  Fixes &lt;https://issues.guix.gnu.org/45202&gt;.

* gnu/services/security-token.scm (pcscd)[start]: Use
fork+exec-command to start "pcscd".
</span></span></td><td>Brice Waegeneire</td></tr>
<tr><td><span title='2021-06-19 23:49:18 +0200'>2021-06-19</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=4bed8486d4c0a4ff142903b8bc1584ce84767355'>services: pcscd: Cleanup socket when started.</a><span class='msg-avail'>...<span class='msg-tooltip'>Otherwise when pcscd doesn't terminate properly (ie. receive a SIGKILL),
it won't start again because of it's socket already existing.

* gnu/services/security-token.scm (pcscd-shepherd-service)[start]:
Remove existing socket file.
</span></span></td><td>Brice Waegeneire</td></tr>