Commit 416a67d4 authored by Aaron M. Ucko's avatar Aaron M. Ucko

Find FreeType via pkg-config; freetype-config deprecated (#892341).

* debian/control: Add pkg-config to Build-Depends.
* debian/rules: Pass "/usr/bin/pkg-config freetype2" off as FTCONFIG
  (in lieu of freetype-config, which is now deprecated).
parent 8cccd254
fltk1.1 (1.1.10-24) UNRELEASED; urgency=medium
* NOT YET RELEASED.
* debian/rules: Address FTCBFS, based on a patch from Helmut Grohne
(Closes: #887636).
- Avoid configuring during clean.
- Do not pass build architecture compiler to configure.
- In arch-only builds, limit coverage of test/ to the three targets we
specifically need for fltk1.1-games. (Many of the others involve
trying to run freshly built fluid.)
-- Aaron M. Ucko <ucko@debian.org> Fri, 09 Mar 2018 17:26:50 -0500
* debian/control: Add pkg-config to Build-Depends.
* debian/rules:
- Address FTCBFS, based on a patch from Helmut Grohne (Closes: #887636).
+ Avoid configuring during clean.
+ Do not pass build architecture compiler to configure.
+ In arch-only builds, limit coverage of test/ to the three targets we
specifically need for fltk1.1-games. (Many of the others involve
trying to run freshly built fluid.)
- Pass "/usr/bin/pkg-config freetype2" off as FTCONFIG (in lieu of
freetype-config, which is now deprecated). (Closes: #892341.)
-- Aaron M. Ucko <ucko@debian.org> Fri, 09 Mar 2018 17:48:44 -0500
fltk1.1 (1.1.10-23) unstable; urgency=medium
......
......@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 9),
libxext-dev,
libxft-dev,
libxinerama-dev,
pkg-config,
zlib1g-dev | libz-dev
Build-Depends-Arch: libasound2-dev [linux-any]
Build-Depends-Indep: htmldoc
......
......@@ -21,7 +21,7 @@ EXTRA_MFLAGS = OPTIM="$(CFLAGS) $(XCFLAGS)" STRIP=@:
override_dh_auto_configure:
mv fltk.spec fltk.spec.saved
dh_auto_configure -- \
dh_auto_configure -- FTCONFIG="/usr/bin/pkg-config freetype2" \
DSOFLAGS="$(filter-out -fPIE -pie,$(LDFLAGS))" \
--enable-shared --enable-threads --enable-xft \
--enable-xinerama --without-links --libdir=$(libdir) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment