Hi,
Here is an update for mtpaint to 3.50.
Upstream re-enabled -fcommon with clang11 and gcc10 in this version, but
since the compiler version is checked, it's still failing with a patched
`-fno-common' patched clang-10. I have been advised by naddy to
explicitly use `-fcommon' until clang-11 becomes our default compiler.
While here, the spacing was inconsistent around '=', so i fixed this
as well, since it did not hinder much the diff readability.
It has been built and (lightly) tested on amd64 (patched clang) and
macppc (vanilla clang).
OK?
Charlène.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/mtpaint/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 12 Jul 2019 20:47:04 -0000 1.5
+++ Makefile 30 Jan 2021 23:20:43 -0000
@@ -2,9 +2,8 @@
COMMENT = simple GTK+2 raster painting program
-DISTNAME = mtpaint-3.40
+DISTNAME = mtpaint-3.50
EXTRACT_SUFX = .tar.bz2
-REVISION = 2
CATEGORIES = graphics
@@ -16,8 +15,9 @@ PERMIT_PACKAGE = Yes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-x11-2.0 intl jasper jpeg lcms2 m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 png pthread tiff z
+WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz intl jasper jpeg lcms2
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 png pthread
+WANTLIB += tiff z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mtpaint/}
@@ -30,11 +30,15 @@ LIB_DEPENDS = devel/gettext,-runtime \
RUN_DEPENDS = devel/desktop-file-utils
USE_GMAKE = Yes
-CONFIGURE_STYLE = simple
-CONFIGURE_ARGS = nogif jpeg jasper staticft tiff lcms \
- lcms2 intl man thread cflags \
- --mandir=${TRUEPREFIX}/man
-
-NO_TEST= Yes
+CONFIGURE_STYLE = simple
+CONFIGURE_ARGS = nogif jpeg jasper staticft tiff lcms \
+ lcms2 intl man thread cflags \
+ --mandir=${TRUEPREFIX}/man
+
+NO_TEST = Yes
+
+# Remove after clang update to LLVM11. Meanwhile it avoids false positives with
+# a patched clang-10 (mtpaint uses that flag only with clang-11 and gcc-10)
+CFLAGS += -fcommon
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/mtpaint/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 25 Apr 2016 13:22:00 -0000 1.1.1.1
+++ distinfo 30 Jan 2021 23:20:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (mtpaint-3.40.tar.bz2) = 7zIdK0BIOce5Cb31KD6yKjf73TW0zJ44DdxABXPXyJA=
-SIZE (mtpaint-3.40.tar.bz2) = 600857
+SHA256 (mtpaint-3.50.tar.bz2) = aVzqEMQoqPEi7Vm+7l/6Sdzcuo2IpHkOrzxk/Xxz1qw=
+SIZE (mtpaint-3.50.tar.bz2) = 800134
