diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile --- a/x11-wm/fvwm3/Makefile +++ b/x11-wm/fvwm3/Makefile @@ -1,6 +1,5 @@ PORTNAME= fvwm3 -DISTVERSION= 1.0.5 -PORTREVISION= 5 +PORTVERSION= 1.0.6a CATEGORIES= x11-wm MASTER_SITES= https://github.com/fvwmorg/fvwm3/releases/download/${DISTVERSION}/ \ http://fvwm.sourceforge.net/generated/icon_download/:icons @@ -16,7 +15,7 @@ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig -USES= compiler:c11 cpe pkgconfig python:3.7+ readline xorg +USES= autoreconf compiler:c11 cpe pkgconfig python:3.7+ readline xorg USE_XORG= ice sm x11 xext xft xrandr xrender xt CONFLICTS_INSTALL= fvwm @@ -38,7 +37,7 @@ FRIBIDI_CONFIGURE_ENABLE= bidi GO_DESC= Build and install modules written in Go -GO_USES= go:1.19,no_targets +GO_USES= go:no_targets GO_CONFIGURE_ENABLE= golang FVWM_ICONS= fvwm_icons-20070101 @@ -73,15 +72,6 @@ XPM_USE= xorg=xpm XPM_CONFIGURE_OFF= --with-xpm-library=no -.include - -# Clang 15 promoted some warnings to errors. The upstream configure script -# expects one of them to be only a warning. Work around this by explicitly -# disabling the error here. FIXME: Check whether still needed on upgrades. -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 -CONFIGURE_ARGS+= CFLAGS="${CFLAGS} -Wno-error=int-conversion" -.endif - post-patch: @${REINPLACE_CMD} -e 's,/etc/,${LOCALBASE}/etc/,g' \ ${WRKSRC}/bin/fvwm-menu-desktop.in diff --git a/x11-wm/fvwm3/distinfo b/x11-wm/fvwm3/distinfo --- a/x11-wm/fvwm3/distinfo +++ b/x11-wm/fvwm3/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1664448220 -SHA256 (fvwm3-1.0.5.tar.gz) = c41a7eaf1cbdebcbcc7ffc773bb25cc07879fbce3429633dd0584e8ebc8b1014 -SIZE (fvwm3-1.0.5.tar.gz) = 4538262 +TIMESTAMP = 1676896741 +SHA256 (fvwm3-1.0.6a.tar.gz) = 4665a66133e070b791917b0794cc6df6b754679ebe9130718427db6479bb5b68 +SIZE (fvwm3-1.0.6a.tar.gz) = 4538100 SHA256 (fvwm_icons-20070101.tar.bz2) = 86b0164430a3087f5cb8d55eb43a8676bbce495814b30c6844eb127f952642ab SIZE (fvwm_icons-20070101.tar.bz2) = 330862 diff --git a/x11-wm/fvwm3/files/patch-configure.ac b/x11-wm/fvwm3/files/patch-configure.ac new file mode 100644 --- /dev/null +++ b/x11-wm/fvwm3/files/patch-configure.ac @@ -0,0 +1,29 @@ +--- configure.ac.orig 2023-01-16 19:48:02 UTC ++++ configure.ac +@@ -86,7 +86,7 @@ if test ! x"$with_golang" = xno; then + sed -e 's/ .*$//') + AC_MSG_CHECKING([whether go version is >= 1.14.x ($go_version)]) + case "$go_version" in +- 1.14*|1.15*|1.16*|1.17*|1.18*|1.19*) ++ 1.14*|1.15*|1.16*|1.17*|1.18*|1.19*|1.2*) + AC_MSG_RESULT([yes - version is: $go_version]) + with_golang="yes" + GO= +@@ -224,17 +224,6 @@ AC_MINIX + # Help finding POSIX functions on some systems + AC_ISC_POSIX + AC_MINIX +- +-# catch -Werror and similar options when running configure +-AC_TRY_COMPILE([#include ], +-[int i; static j; int *p; char *c; +- switch (*p = p = *c) { case 0: printf("%Q", c, p); } +- *c = &i; c = p; +- while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1)); +-], , AC_MSG_ERROR(" +-configure is not able to compile programs with warnings. Please +-remove all offending options like -Werror from the CFLAGS and +-CPPFLAGS variables and run configure again.")) + + # check size of some types + ac_save_CFLAGS="$CFLAGS" diff --git a/x11-wm/fvwm3/files/patch-pr265291 b/x11-wm/fvwm3/files/patch-pr265291 deleted file mode 100644 --- a/x11-wm/fvwm3/files/patch-pr265291 +++ /dev/null @@ -1,18 +0,0 @@ -Avoid a crash caused by UB (use of uninitialized value). - -Initialize a value to NULL and backport code handling this case from main. -This won't hurt and avoids the crash, although it's probably not the correct -fix. - -Upstream issue: https://github.com/fvwmorg/fvwm3/issues/659 - ---- modules/FvwmIconMan/x.c.orig 2022-09-21 21:44:02 UTC -+++ modules/FvwmIconMan/x.c -@@ -741,6 +741,7 @@ void X_init_manager (int man_id) - if (man->geometry_str) { - fscreen_scr_arg arg; - arg.mouse_ev = NULL; -+ arg.name = NULL; - - geometry_mask = FScreenParseGeometryWithScreen( - man->geometry_str, &man->geometry.x, &man->geometry.y, diff --git a/x11-wm/fvwm3/pkg-plist b/x11-wm/fvwm3/pkg-plist --- a/x11-wm/fvwm3/pkg-plist +++ b/x11-wm/fvwm3/pkg-plist @@ -1,6 +1,5 @@ bin/FvwmCommand %%GO%%bin/FvwmPrompt -bin/fvwm-config %%PERL%%bin/fvwm-convert-2.6 bin/fvwm-menu-desktop %%PERL%%bin/fvwm-menu-directory @@ -41,7 +40,6 @@ %%MANPAGES%%man/man1/FvwmPrompt.1.gz %%MANPAGES%%man/man1/FvwmRearrange.1.gz %%MANPAGES%%man/man1/FvwmScript.1.gz -%%MANPAGES%%man/man1/fvwm-config.1.gz %%MANPAGES%%man/man1/fvwm-convert-2.6.1.gz %%MANPAGES%%man/man1/fvwm-menu-desktop.1.gz %%MANPAGES%%man/man1/fvwm-menu-directory.1.gz @@ -49,7 +47,6 @@ %%MANPAGES%%man/man1/fvwm-perllib.1.gz %%MANPAGES%%man/man1/fvwm-root.1.gz %%MANPAGES%%man/man1/fvwm3.1.gz -%%MANPAGES%%man/man1/fvwm3_manpage_source.1.gz %%MANPAGES%%man/man1/fvwm3all.1.gz %%MANPAGES%%man/man1/fvwm3commands.1.gz %%MANPAGES%%man/man1/fvwm3menus.1.gz @@ -87,7 +84,6 @@ %%DATADIR%%/FvwmScript-ScreenDump %%DATADIR%%/FvwmScript-ScreenSetup %%DATADIR%%/FvwmScript-WidgetDemo -%%DATADIR%%/default-config/.stalonetrayrc %%DATADIR%%/default-config/FvwmScript-ConfirmCopyConfig %%DATADIR%%/default-config/FvwmScript-ConfirmQuit %%DATADIR%%/default-config/FvwmScript-DateTime @@ -126,6 +122,7 @@ %%DATADIR%%/default-config/images/icons/win/sticky.png %%DATADIR%%/default-config/images/icons/win/title.png %%DATADIR%%/default-config/images/icons/win/top.png +%%DATADIR%%/default-config/stalonetrayrc %%DATADIR%%/fvwm-menu-desktop-config.fpl %%DATADIR%%/fvwm-script-ComExample.pl %%PERL%%%%DATADIR%%/perllib/FVWM/Commands.pm