diff options
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | libwmf-freetype.patch | 65 |
3 files changed, 9 insertions, 81 deletions
@@ -1,7 +1,7 @@ pkgbase = lib32-libwmf pkgdesc = A library for reading vector images in Microsoft's native Windows Metafile Format (WMF) (32-bit) - pkgver = 0.2.12 - pkgrel = 2 + pkgver = 0.2.13 + pkgrel = 1 url = http://wvware.sourceforge.net/libwmf.html arch = x86_64 license = LGPL @@ -13,10 +13,7 @@ pkgbase = lib32-libwmf depends = libwmf options = !docs options = !emptydirs - source = libwmf-0.2.12.tar.gz::https://github.com/caolanm/libwmf/archive/v0.2.12.tar.gz - source = libwmf-freetype.patch - sha1sums = 490a26175ad667fbc0c009d390bf56644919bed6 - sha1sums = ef4d452cd5e7fcb36751771c6f44b4b7a3f8693a + source = libwmf-0.2.13.tar.gz::https://github.com/caolanm/libwmf/archive/v0.2.13.tar.gz + sha256sums = 18ba69febd2f515d98a2352de284a8051896062ac9728d2ead07bc39ea75a068 pkgname = lib32-libwmf - @@ -3,8 +3,8 @@ _basename=libwmf pkgname=lib32-libwmf -pkgver=0.2.12 -pkgrel=2 +pkgver=0.2.13 +pkgrel=1 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF) (32-bit)" arch=('x86_64') url="http://wvware.sourceforge.net/libwmf.html" @@ -12,17 +12,13 @@ license=('LGPL') depends=('lib32-expat' 'lib32-freetype2' 'lib32-gdk-pixbuf2' 'libwmf') makedepends=('lib32-gtk2' 'lib32-libxt') options=('!docs' '!emptydirs') -source=($_basename-$pkgver.tar.gz::https://github.com/caolanm/libwmf/archive/v$pkgver.tar.gz - libwmf-freetype.patch) -sha1sums=('490a26175ad667fbc0c009d390bf56644919bed6' - 'ef4d452cd5e7fcb36751771c6f44b4b7a3f8693a') +source=(${_basename}-${pkgver}.tar.gz::https://github.com/caolanm/libwmf/archive/v${pkgver}.tar.gz) +sha256sums=('18ba69febd2f515d98a2352de284a8051896062ac9728d2ead07bc39ea75a068') prepare() { cd ${_basename}-${pkgver} - patch -p1 -i ../libwmf-freetype.patch # Port away from freetype-config, patch from openembedded.org - - autoreconf -vif -Ipatches + autoreconf -fi } build() { diff --git a/libwmf-freetype.patch b/libwmf-freetype.patch deleted file mode 100644 index c16a523bb668..000000000000 --- a/libwmf-freetype.patch +++ /dev/null @@ -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 * * *]) - ]) - - |