Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Apr 2023 08:55:04 GMT
From:      =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: afb27cb9aeae - 2023Q2 - graphics/libwmf: update to 0.2.13
Message-ID:  <202304190855.33J8t4t7049262@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2023Q2 has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=afb27cb9aeaeb40147c9c84e4c6a7a1595e2ac9d

commit afb27cb9aeaeb40147c9c84e4c6a7a1595e2ac9d
Author:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
AuthorDate: 2023-04-18 07:58:54 +0000
Commit:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
CommitDate: 2023-04-19 08:50:24 +0000

    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)
    
    (cherry picked from commit 809d0d3911ab6b34d61c2b16b8ac6dae44829aa6)
---
 graphics/libwmf/Makefile                 | 21 ++++++++++-----------
 graphics/libwmf/distinfo                 |  6 +++---
 graphics/libwmf/files/patch-configure.ac | 32 ++++++++++++++++++--------------
 graphics/libwmf/pkg-plist                |  4 ++--
 4 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 6afcbfd7b43b..cc7d1ef7f7dc 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -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 - . | \
diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index 30f217e17626..2c7aa31eeedf 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -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
diff --git a/graphics/libwmf/files/patch-configure.ac b/graphics/libwmf/files/patch-configure.ac
index ce69d9f28219..a0f0de3256d0 100644
--- a/graphics/libwmf/files/patch-configure.ac
+++ b/graphics/libwmf/files/patch-configure.ac
@@ -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"
  
diff --git a/graphics/libwmf/pkg-plist b/graphics/libwmf/pkg-plist
index 7c0377430d47..838166ad5cda 100644
--- a/graphics/libwmf/pkg-plist
+++ b/graphics/libwmf/pkg-plist
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304190855.33J8t4t7049262>