[foobillardplus] 04/07: Add pkg-config.patch and use pkg-config instead of freetype-config.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository foobillardplus.

commit 98d6bfef6a7247fd66ff8f845d2d3c475621b75a
Author: Markus Koschany <apo at debian.org>
Date:   Thu Mar 8 17:52:12 2018 +0100

    Add pkg-config.patch and use pkg-config instead of freetype-config.
    
    Closes: #892338
---
 debian/patches/pkg-config.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/pkg-config.patch b/debian/patches/pkg-config.patch
new file mode 100644
index 0000000..b2495be
--- /dev/null
+++ b/debian/patches/pkg-config.patch
@@ -0,0 +1,34 @@
+From: Markus Koschany <apo at 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`
++FREETYPE_LIBS   = `pkg-config --libs`
+ 
+ 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}
diff --git a/debian/patches/series b/debian/patches/series
index 1dc0c28..95626b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ generic-x-www-browser.patch
 add-support-for-hardening-build-flags.patch
 fix-Makefile.am.patch
 hide-foobillardplus-user-settings-in-HOME.patch
+pkg-config.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/foobillardplus.git