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}
href='/guix/refs/?id=012492aab95122941fcb234bef6bb5a4e3bb2ece'>refs</a><a href='/guix/log/gnu/services/cgit.scm'>log</a><a href='/guix/tree/gnu/services/cgit.scm?id=012492aab95122941fcb234bef6bb5a4e3bb2ece'>tree</a><a class='active' href='/guix/commit/gnu/services/cgit.scm?id=012492aab95122941fcb234bef6bb5a4e3bb2ece'>commit</a><a href='/guix/diff/gnu/services/cgit.scm?id=012492aab95122941fcb234bef6bb5a4e3bb2ece'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/cgit.scm'>
<input type='hidden' name='id' value='012492aab95122941fcb234bef6bb5a4e3bb2ece'/><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/commit/?id=012492aab95122941fcb234bef6bb5a4e3bb2ece'>root</a>/<a href='/guix/commit/gnu?id=012492aab95122941fcb234bef6bb5a4e3bb2ece'>gnu</a>/<a href='/guix/commit/gnu/services?id=012492aab95122941fcb234bef6bb5a4e3bb2ece'>services</a>/<a href='/guix/commit/gnu/services/cgit.scm?id=012492aab95122941fcb234bef6bb5a4e3bb2ece'>cgit.scm</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='012492aab95122941fcb234bef6bb5a4e3bb2ece'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Marius Bakke &lt;mbakke@fastmail.com&gt;</td><td class='right'>2019-04-09 19:48:22 +0200</td></tr>
<tr><th>committer</th><td>Marius Bakke &lt;mbakke@fastmail.com&gt;</td><td class='right'>2019-04-09 19:48:46 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/services/cgit.scm?id=012492aab95122941fcb234bef6bb5a4e3bb2ece'>012492aab95122941fcb234bef6bb5a4e3bb2ece</a> (<a href='/guix/patch/gnu/services/cgit.scm?id=012492aab95122941fcb234bef6bb5a4e3bb2ece'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=012492aab95122941fcb234bef6bb5a4e3bb2ece'>9889d0c979c38466afa8f2538818b22f56164b7d</a> /<a href='/guix/tree/gnu/services/cgit.scm?id=012492aab95122941fcb234bef6bb5a4e3bb2ece'>gnu/services/cgit.scm</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/gnu/services/cgit.scm?id=46d072f02a8f60ff196a0fb0bab7617cfd9cfb05'>46d072f02a8f60ff196a0fb0bab7617cfd9cfb05</a> (<a href='/guix/diff/gnu/services/cgit.scm?id=012492aab95122941fcb234bef6bb5a4e3bb2ece&amp;id2=46d072f02a8f60ff196a0fb0bab7617cfd9cfb05'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-012492aab95122941fcb234bef6bb5a4e3bb2ece.tar.gz'>guix-012492aab95122941fcb234bef6bb5a4e3bb2ece.tar.gz</a><br/><a href='/guix/snapshot/guix-012492aab95122941fcb234bef6bb5a4e3bb2ece.zip'>guix-012492aab95122941fcb234bef6bb5a4e3bb2ece.zip</a><br/></td></tr></table>
<div class='commit-subject'>gnu: samba: Update to 4.10.2 [security fixes].</div><div class='commit-msg'>This release fixes CVE-2019-3870 and CVE-2019-3880.

* gnu/packages/samba.scm (samba): Update to 4.10.2.
</div><div class='diffstat-header'><a href='/guix/diff/?id=012492aab95122941fcb234bef6bb5a4e3bb2ece'>Diffstat</a> (limited to 'gnu/services/cgit.scm')</div><table summary='diffstat' class='diffstat'></table><div class='diffstat-summary'>0 files changed, 0 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td></td></tr></table></div> <!-- class=content -->
                         <div class=footer>generated by
                             <a href="https://git.zx2c4.com/cgit/about/">
                                 cgit
                             </a>
                         </div>
                        </div> <!-- id=cgit -->
</body>
</html>