* update libwmf to 0.2.13-1
This commit is contained in:
parent
bc2579c1eb
commit
d14a65a192
@ -2,8 +2,8 @@
|
||||
# Maintainer: Eric Bélanger <eric@archlinux.org>
|
||||
|
||||
pkgname=libwmf
|
||||
pkgver=0.2.12
|
||||
pkgrel=3
|
||||
pkgver=0.2.13
|
||||
pkgrel=1
|
||||
pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)"
|
||||
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
||||
url="http://wvware.sourceforge.net/libwmf.html"
|
||||
@ -12,15 +12,13 @@ depends=('libx11' 'libjpeg' 'gsfonts' 'freetype2' 'expat')
|
||||
makedepends=('gtk2' 'libxt')
|
||||
optdepends=('gdk-pixbuf2: for pixbuf loader')
|
||||
options=('!docs' '!emptydirs')
|
||||
source=($pkgname-$pkgver.tar.gz::https://github.com/caolanm/libwmf/archive/v$pkgver.tar.gz libwmf-freetype.patch)
|
||||
sha256sums=('464ff63605d7eaf61a4a12dbd420f7a41a4d854675d8caf37729f5bc744820e2'
|
||||
'c3b25a70ba55893fdd7637893a3852894260ed94c029f2b3916fc3df3fde32b8')
|
||||
source=($pkgname-$pkgver.tar.gz::https://github.com/caolanm/libwmf/archive/v$pkgver.tar.gz)
|
||||
sha256sums=('18ba69febd2f515d98a2352de284a8051896062ac9728d2ead07bc39ea75a068')
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
patch -p1 -i ../libwmf-freetype.patch # Port away from freetype-config, patch from openembedded.org
|
||||
autoreconf -vif -Ipatches
|
||||
}
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
|
@ -1,65 +0,0 @@
|
||||
From 61655f82224cadb261e81f8bae111eaaa7bdf531 Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Wed, 6 Aug 2014 14:53:03 +0200
|
||||
Subject: [PATCH] configure: use pkg-config for freetype
|
||||
|
||||
Upstream-status: Pending
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
configure.ac | 37 ++++++++-----------------------------
|
||||
1 file changed, 8 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3cfe974..0055a8c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -399,40 +399,19 @@ AC_ARG_WITH(freetype,[ --with-freetype=DIR use freetype2 in DIR],[
|
||||
fi
|
||||
])
|
||||
|
||||
-if [ test -n "$FREETYPE_DIR" ]; then
|
||||
- AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, ,[$FREETYPE_DIR/bin:$PATH])
|
||||
-else
|
||||
- AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
|
||||
-fi
|
||||
-
|
||||
-if [ test -n "$FREETYPE_CONFIG" ]; then
|
||||
- if [ test -n "$FREETYPE_DIR" ]; then
|
||||
- freetype_cflags="`$FREETYPE_CONFIG --cflags` -I$FREETYPE_DIR/include"
|
||||
- freetype_libs=`$FREETYPE_CONFIG --libs`
|
||||
- else
|
||||
- freetype_cflags=`$FREETYPE_CONFIG --cflags`
|
||||
- freetype_libs=`$FREETYPE_CONFIG --libs`
|
||||
- fi
|
||||
-else
|
||||
- if [ test -n "$FREETYPE_DIR" ]; then
|
||||
- freetype_cflags="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include"
|
||||
- freetype_libs="-L$FREETYPE_DIR/lib -lfreetype"
|
||||
- else
|
||||
- freetype_cflags=""
|
||||
- freetype_libs="-lfreetype"
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
-CPPFLAGS="$freetype_cflags $CPPFLAGS"
|
||||
-LDFLAGS="$LDFLAGS $freetype_libs"
|
||||
+PKG_CHECK_MODULES(FREETYPE2, freetype2,
|
||||
+ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
|
||||
+ LDFLAGS="$LDFLAGS $FREETYPE2_LIBS",
|
||||
+ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)])
|
||||
+)
|
||||
|
||||
AC_CHECK_LIB(freetype,FT_Init_FreeType,[
|
||||
- WMF_FT_LDFLAGS="$freetype_libs"
|
||||
+ WMF_FT_LDFLAGS="$FREETYPE2_LIBS"
|
||||
],[ AC_MSG_ERROR([* * * freetype(2) is required * * *])
|
||||
])
|
||||
AC_CHECK_HEADER(ft2build.h,[
|
||||
- WMF_FT_CFLAGS="$freetype_cflags"
|
||||
- WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
|
||||
+ WMF_FT_CFLAGS="$FREETYPE2_CFLAGS"
|
||||
+ WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS"
|
||||
],[ AC_MSG_ERROR([* * * freetype(2) is required * * *])
|
||||
])
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user