Date: Tue, 04 Jan 2022 14:09:32 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 260922] print/ft2demos: fix build and use meson now, update to 2.11.1 Message-ID: <bug-260922-7788-p7BBJnrTl9@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-260922-7788@https.bugs.freebsd.org/bugzilla/> References: <bug-260922-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D260922 --- Comment #1 from Eric Gullufsen <ricky@rickysquid.org> --- Comment on attachment 230684 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D230684 Patch file to fix broken ft2demos port diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile index cc07936c3d94..02a411654dca 100644 --- a/print/ft2demos/Makefile +++ b/print/ft2demos/Makefile @@ -1,10 +1,10 @@ # Created by: KANOU Hiroki <kanou@khdd.net> PORTNAME=3D ft2demos -PORTVERSION=3D 2.10.4 +PORTVERSION=3D 2.11.1 CATEGORIES=3D print -MASTER_SITES=3D SAVANNAH/freetype/ \ - SF/freetype/freetype-demos/${PORTVERSION} + +MASTER_SITES=3Dhttps://gitlab.freedesktop.org MAINTAINER=3D ports@FreeBSD.org COMMENT=3D Demo programs for FreeType2 @@ -12,16 +12,20 @@ COMMENT=3D Demo programs for FreeType2 LICENSE=3D BSD3CLAUSE GPLv2 LICENSE_COMB=3D dual -BROKEN=3D Doesn't build with FreeType 2.11.0 - BUILD_DEPENDS=3D ${NONEXISTENT}:print/freetype2:build LIB_DEPENDS=3D libfreetype.so:print/freetype2 \ libpng.so:graphics/png -USES=3D gmake tar:xz xorg -USE_XORG=3D x11 +USES=3D tar:xz xorg +USE_XORG=3D x11 -MAKE_ARGS=3D EXES=3D"${FT_PROGRAMS}" X11_PATH=3D"${LOCALBASE}" +USE_GITLAB=3D yes +GL_PROJECT=3Dfreetype-demos +GL_ACCOUNT=3Dfreetype +GL_COMMIT=3D07027905d9a47664251b3ee362c5cfad1cddf86f + +USES=3D meson tar:xz xorg +USE_XORG=3D x11 PLIST_FILES=3D ${FT_PROGRAMS:S,^,bin/,} @@ -29,10 +33,11 @@ FT_PROGRAMS=3D ftbench ftchkwd ftdiff ftdump ftg= amma ftgrid ftlint ftmemchk \ ftmulti ftpatchk ftstring fttimer ftvalid ftview post-extract: - ${LN} -sf `${MAKE} -C ${.CURDIR}/../../print/freetype2 -V WRKSRC` ${WRKDIR}/freetype2 + ${LN} -sf `${MAKE} -C ${.CURDIR}/../../print/freetype2 -V WRKSRC` \ + ${WRKDIR}/${GL_PROJECT}-${GL_COMMIT}/subprojects/freetype2 do-install: - @(cd ${WRKSRC}/bin/.libs && \ + @(cd ${WRKSRC}/_build && \ ${INSTALL_PROGRAM} ${FT_PROGRAMS} ${STAGEDIR}${PREFIX}/bin) .include <bsd.port.mk> diff --git a/print/ft2demos/distinfo b/print/ft2demos/distinfo index d2b1796799fb..1f573d4c8c9c 100644 --- a/print/ft2demos/distinfo +++ b/print/ft2demos/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP =3D 1603568666 -SHA256 (ft2demos-2.10.4.tar.xz) =3D 3f873ebe4fb387da3859149459f9be95320ce1fd56b50f8fdb9d2a8492887083 -SIZE (ft2demos-2.10.4.tar.xz) =3D 236712 +TIMESTAMP =3D 1641293484 +SHA256 (freetype-freetype-demos-07027905d9a47664251b3ee362c5cfad1cddf86f_GL0.tar.g= z) =3D 61c872dde5aa69fc0a27019950c301cd3db7f11a776e4eb9859311d2fc0d3d5e +SIZE (freetype-freetype-demos-07027905d9a47664251b3ee362c5cfad1cddf86f_GL0.tar.g= z) =3D 342190 diff --git a/print/ft2demos/files/patch-Makefile b/print/ft2demos/files/patch-Makefile deleted file mode 100644 index d4fdf71abe9c..000000000000 --- a/print/ft2demos/files/patch-Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile.orig 2017-03-29 16:20:30 UTC -+++ Makefile -@@ -136,11 +136,9 @@ else - # Enable C99 for gcc to avoid warnings. - # Note that clang++ aborts with an error if we use `-std=3DC99', - # so check for `++' in $(CC) also. -- ifneq ($(findstring -pedantic,$(COMPILE)),) - ifeq ($(findstring ++,$(CC)),) - COMPILE +=3D -std=3Dc99 - endif -- endif -=20 - FTLIB :=3D $(LIB_DIR)/$(LIBRARY).$A -=20 diff --git a/print/ft2demos/files/patch-meson.build b/print/ft2demos/files/patch-meson.build new file mode 100644 index 000000000000..69d0d5831227 --- /dev/null +++ b/print/ft2demos/files/patch-meson.build @@ -0,0 +1,11 @@ +--- meson.build.orig 2021-12-02 03:37:39.000000000 -0900 ++++ meson.build 2022-01-04 02:25:43.961204000 -0900 +@@ -112,7 +112,7 @@ +=20 + executable('ftgrid', + 'src/ftgrid.c', +- dependencies: libfreetype2_dep, ++ dependencies: [libfreetype2_dep, math_dep], + include_directories: graph_include_dir, + link_with: [ftcommon_lib, output_lib], + install: true) --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-260922-7788-p7BBJnrTl9>