d/patches: add fix-ftbfs-892448.patch (Closes: #892448)
Use pkg-config instead of freetype-config, deprecated and about to be removed.
Manuel A. Fernandez Montecelo
5 years ago
| 7 | 7 |
* Set "Rules-Requires-Root: no" in d/control
|
| 8 | 8 |
* d/copyright: use https in format URL
|
| 9 | 9 |
* d/watch: Switch to version=4
|
|
10 |
* d/patches:
|
|
11 |
- add fix-ftbfs-892448.patch: use pkg-config instead of freetype-config,
|
|
12 |
deprecated and about to be removed (Closes: #892448)
|
| 10 | 13 |
|
| 11 | 14 |
-- Manuel A. Fernandez Montecelo <mafm@debian.org> Tue, 27 Jun 2017 22:04:26 +0200
|
| 12 | 15 |
|
|
0 |
--- a/Makefile.conf
|
|
1 |
+++ b/Makefile.conf
|
|
2 |
@@ -36,15 +36,15 @@
|
|
3 |
|
|
4 |
|
|
5 |
# Is freetype-config available?
|
|
6 |
-HAVE_FT =$(shell if (freetype-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
|
|
7 |
+HAVE_FT =$(shell if (pkg-config --modversion freetype2) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
|
|
8 |
ifeq ($(HAVE_FT),n)
|
|
9 |
USE_FT = n
|
|
10 |
endif
|
|
11 |
|
|
12 |
ifneq ($(USE_FT),n)
|
|
13 |
USE_FT = y
|
|
14 |
- SGE_LIBS +=$(shell freetype-config --libs)
|
|
15 |
- FT_CFLAGS =$(shell freetype-config --cflags)
|
|
16 |
+ SGE_LIBS +=$(shell pkg-config freetype2 --libs)
|
|
17 |
+ FT_CFLAGS =$(shell pkg-config freetype2 --cflags)
|
|
18 |
endif
|
|
19 |
|
|
20 |
|
|
0 |
fix-ftbfs-892448.patch
|
| 0 | 1 |
001_makefile_fixes.diff
|
| 1 | 2 |
004_legacy_functions.diff
|
| 2 | 3 |
005_freetype_support.diff
|