mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-08 05:29:22 +00:00
Code Issues Projects Releases Wiki Activity

libgnomeprint: use pkgconfig for freetype support

Browse Source 
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Koen Kooi
2014-08-01 15:34:56 +02:00
committed by Martin Jansa
parent d35ade7045
commit 33cf167042
2 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch
+37
View File
@@ -0,0 +1,37 @@
From ed31fd89f4c77d89390774d29427898a85b25ab1 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Fri, 1 Aug 2014 13:58:36 +0200
Subject: [PATCH] configure: use pkgconfig for freetype
Upstream-status: Pending
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
configure.in | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/configure.in b/configure.in
index 729278d..e569429 100644
--- a/configure.in
+++ b/configure.in
@@ -164,13 +164,11 @@ dnl Checking for freetype2
dnl =================================
FREETYPE_LIBS=
FREETYPE_CFLAGS=
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-if test "x$FREETYPE_CONFIG" = "xno" ; then
- AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint)
-else
- FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
-fi
+PKG_CHECK_MODULES(FREETYPE2, freetype2,
+ FREETYPE_CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
+ FREETYPE_LIBS="$LIBS $FREETYPE2_LIBS",
+ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)])
+)
libgnomeprint_save_ldflags=$LDFLAGS
LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
--
1.9.0
meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb
+1 -4
View File
@@ -1,10 +1,6 @@
LICENSE = "GPLv2"
SECTION = "x11/gnome/libs"
# | checking for freetype-config... no
# | configure: error: You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint
PNBLACKLIST[libgnomeprint] = "Broken without freetype-config"
DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common freetype"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
@@ -13,6 +9,7 @@ inherit pkgconfig gnomebase
SRC_URI += "file://fix.includes.patch \
file://freetype.patch \
file://0001-configure-use-pkgconfig-for-freetype.patch \
"
SRC_URI[archive.md5sum] = "63b05ffb5386e131487c6af30f4c56ac"
SRC_URI[archive.sha256sum] = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691"