1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

graphics/libwmf: update to 0.2.13

ChangeLog: https://github.com/caolanm/libwmf/releases/tag/v0.2.13

Fixes two crashes, one in gimp the other if no appropriate GS fonts are found.

Reported by:	portscout
MFH:		2023Q2 (bugfixes)
This commit is contained in:
Fernando Apesteguía 2023-04-18 09:58:54 +02:00
parent a81cc06ee3
commit 809d0d3911
4 changed files with 33 additions and 30 deletions

View File

@ -1,7 +1,6 @@
PORTNAME= libwmf
DISTVERSIONPREFIX= v
DISTVERSION= 0.2.12
PORTREVISION= 1
DISTVERSION= 0.2.13
CATEGORIES= graphics
MAINTAINER= ports@FreeBSD.org
@ -18,8 +17,8 @@ LIB_DEPENDS= libpng.so:graphics/png \
USES= autoreconf:build cpe gnome jpeg libtool localbase pkgconfig
USE_GITHUB= yes
USE_GNOME= gdkpixbuf2
GH_ACCOUNT= caolanm
USE_GNOME= gdkpixbuf2
USE_LDCONFIG= yes
CPE_VENDOR= wvware
@ -27,10 +26,10 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts
INSTALL_TARGET= install-strip
PORTDOCS= *
CONFLICTS?= libwmf-nox11
PORTDOCS= *
OPTIONS_DEFINE= X11 DOCS
OPTIONS_DEFAULT=X11
OPTIONS_SUB= yes
@ -39,6 +38,12 @@ X11_USES= xorg
X11_USE= XORG=x11
X11_CONFIGURE_OFF=--with-x=no
post-patch:
@${REINPLACE_CMD} -e \
's|@LIBWMF_GDK_PIXBUF_TRUE@|#|g ; \
s|@LIBWMF_GDK_PIXBUF_FALSE@||g ; \
s|: install-loaderLTLIBRARIES|:|g' ${WRKSRC}/src/Makefile.in
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} AUTOHEADER="${TRUE}" \
${LOCALBASE}/bin/autoreconf -vif -Ipatches)
@ -47,12 +52,6 @@ post-configure:
@${REINPLACE_CMD} -e 's|autoheader|autoheader -Ipatches|g' \
${WRKSRC}/Makefile
post-patch:
@${REINPLACE_CMD} -e \
's|@LIBWMF_GDK_PIXBUF_TRUE@|#|g ; \
s|@LIBWMF_GDK_PIXBUF_FALSE@||g ; \
s|: install-loaderLTLIBRARIES|:|g' ${WRKSRC}/src/Makefile.in
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . | \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1608812851
SHA256 (caolanm-libwmf-v0.2.12_GH0.tar.gz) = 464ff63605d7eaf61a4a12dbd420f7a41a4d854675d8caf37729f5bc744820e2
SIZE (caolanm-libwmf-v0.2.12_GH0.tar.gz) = 3043572
TIMESTAMP = 1681804461
SHA256 (caolanm-libwmf-v0.2.13_GH0.tar.gz) = 18ba69febd2f515d98a2352de284a8051896062ac9728d2ead07bc39ea75a068
SIZE (caolanm-libwmf-v0.2.13_GH0.tar.gz) = 3044235

View File

@ -1,6 +1,13 @@
--- configure.ac.orig 2019-02-01 17:51:32 UTC
--- configure.ac.orig 2023-04-17 11:39:47 UTC
+++ configure.ac
@@ -391,40 +391,19 @@ AC_ARG_WITH(freetype,[ --with-freetype=DIR use fr
@@ -1,5 +1,5 @@
-dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/player.c)
+dnl Process this file with autoconf to produce a configure script. AC_INIT(src/player.c)
LIBWMF_PACKAGE=libwmf
AC_SUBST(LIBWMF_PACKAGE)
@@ -391,37 +391,16 @@ AC_ARG_WITH(freetype,[ --with-freetype=DIR use fr
fi
])
@ -36,16 +43,13 @@
-CPPFLAGS="$freetype_cflags $CPPFLAGS"
-LDFLAGS="$LDFLAGS $freetype_libs"
-
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 * * *])
])
PKG_CHECK_MODULES(FT2, freetype2)
-WMF_FT_LDFLAGS=$FT2_LIBS
-WMF_FT_CFLAGS=$FT2_CFLAGS
-WMF_FT_CONFIG_CFLAGS=$FT2_CFLAGS
+WMF_FT_LDFLAGS="$FREETYPE2_LIBS"
+WMF_FT_CFLAGS="$FREETYPE2_CFLAGS"
+WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS"
GD_DEFS="$GD_DEFS -DHAVE_LIBFREETYPE"

View File

@ -32,11 +32,11 @@ include/libwmf/x.h
lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/io-wmf.a
lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/io-wmf.so
lib/libwmf-0.2.so.7
lib/libwmf-0.2.so.7.1.4
lib/libwmf-0.2.so.7.1.5
lib/libwmf.a
lib/libwmf.so
lib/libwmflite-0.2.so.7
lib/libwmflite-0.2.so.7.0.5
lib/libwmflite-0.2.so.7.0.6
lib/libwmflite.a
lib/libwmflite.so
libdata/pkgconfig/libwmf.pc