pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/wm/fvwm
Module Name: pkgsrc
Committed By: vins
Date: Wed Jan 18 07:43:16 UTC 2023
Modified Files:
pkgsrc/wm/fvwm: Makefile PLIST distinfo options.mk
Added Files:
pkgsrc/wm/fvwm/patches: patch-configure patch-fvwm_fvwm.c
Removed Files:
pkgsrc/wm/fvwm/patches: patch-ab patch-fvwm_fvwm-reproducible.c
Log Message:
wm/fvwm: update to fvwm-2.7.0
This a bugfix release for the fvwm2 branch.
* Changes (local)
- GTK1+ support removed (already dropped upstream as of release 2.6.7)
- patches renamed to match target file
- linted
-------------------------------------------------------------------
Changes in stable release 2.7.0 (19-Oct-2022)
* Bug fixes:
- Fix handling of configure's --enable-mandoc/--enable-htmldoc
- Fix crash in FvwmPager when desk height or width is 0
- Added DoubleClick time to man page.
- Fix to FvwmIconMan to disable a SizeHint warning.
- Allow for reproducible builds.
- Increase the number of supported mouse buttons to 15.
- Tweaks to configure.ac
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/wm/fvwm/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/fvwm/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/wm/fvwm/distinfo pkgsrc/wm/fvwm/options.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/wm/fvwm/patches/patch-ab
cvs rdiff -u -r0 -r1.3 pkgsrc/wm/fvwm/patches/patch-configure
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/fvwm/patches/patch-fvwm_fvwm-reproducible.c
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/fvwm/patches/patch-fvwm_fvwm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/wm/fvwm/Makefile
diff -u pkgsrc/wm/fvwm/Makefile:1.64 pkgsrc/wm/fvwm/Makefile:1.65
--- pkgsrc/wm/fvwm/Makefile:1.64 Tue Jan 3 17:38:21 2023
+++ pkgsrc/wm/fvwm/Makefile Wed Jan 18 07:43:16 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2023/01/03 17:38:21 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2023/01/18 07:43:16 vins Exp $
DISTNAME= fvwm-${FVWM_VER}
-PKGREVISION= 17
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=fvwmorg/}
GITHUB_RELEASE= ${FVWM_VER}
@@ -12,7 +11,7 @@ COMMENT= Newer version of X11 Virtual wi
LICENSE= gnu-gpl-v2
CONFLICTS= fvwm1-[0-9]* fvwm2-[0-9]* fvwm3-[0-9]* metisse-[0-9]* xpmroot-[0-9]*
-FVWM_VER= 2.6.9
+FVWM_VER= 2.7.0
GNU_CONFIGURE= YES
USE_TOOLS+= perl:run tar pkg-config
Index: pkgsrc/wm/fvwm/PLIST
diff -u pkgsrc/wm/fvwm/PLIST:1.6 pkgsrc/wm/fvwm/PLIST:1.7
--- pkgsrc/wm/fvwm/PLIST:1.6 Sat Apr 25 19:40:55 2020
+++ pkgsrc/wm/fvwm/PLIST Wed Jan 18 07:43:16 2023
@@ -1,8 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/04/25 19:40:55 nikita Exp $
-@pkgdir share/doc/fvwm2/commands
-@pkgdir share/doc/fvwm2/fvwm
-@pkgdir share/doc/fvwm2/images/svg_rendering
-@pkgdir share/doc/fvwm2/modules/images/FvwmTabs
+@comment $NetBSD: PLIST,v 1.7 2023/01/18 07:43:16 vins Exp $
bin/FvwmCommand
bin/fvwm
bin/fvwm-bug
@@ -16,33 +12,30 @@ bin/fvwm-perllib
bin/fvwm-root
bin/fvwm2
bin/xpmroot
-lib/X11/fvwm2/${FVWM_VER}/FvwmAnimate
-lib/X11/fvwm2/${FVWM_VER}/FvwmAudio
-lib/X11/fvwm2/${FVWM_VER}/FvwmAuto
-lib/X11/fvwm2/${FVWM_VER}/FvwmBacker
-lib/X11/fvwm2/${FVWM_VER}/FvwmBanner
-lib/X11/fvwm2/${FVWM_VER}/FvwmButtons
-lib/X11/fvwm2/${FVWM_VER}/FvwmCascade
-lib/X11/fvwm2/${FVWM_VER}/FvwmCommand.pm
-lib/X11/fvwm2/${FVWM_VER}/FvwmCommand.sh
-lib/X11/fvwm2/${FVWM_VER}/FvwmCommandS
-lib/X11/fvwm2/${FVWM_VER}/FvwmConsole
-lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC
-lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC.pl
-lib/X11/fvwm2/${FVWM_VER}/FvwmCpp
-lib/X11/fvwm2/${FVWM_VER}/FvwmEvent
-lib/X11/fvwm2/${FVWM_VER}/FvwmForm
-${PLIST.gtk}lib/X11/fvwm2/${FVWM_VER}/FvwmGtk
-lib/X11/fvwm2/${FVWM_VER}/FvwmIconMan
-lib/X11/fvwm2/${FVWM_VER}/FvwmIdent
-lib/X11/fvwm2/${FVWM_VER}/FvwmM4
-lib/X11/fvwm2/${FVWM_VER}/FvwmPager
-lib/X11/fvwm2/${FVWM_VER}/FvwmPerl
-lib/X11/fvwm2/${FVWM_VER}/FvwmProxy
-lib/X11/fvwm2/${FVWM_VER}/FvwmRearrange
-lib/X11/fvwm2/${FVWM_VER}/FvwmScript
-lib/X11/fvwm2/${FVWM_VER}/FvwmTalk
-lib/X11/fvwm2/${FVWM_VER}/FvwmTile
+lib/X11/fvwm2/${PKGVERSION}/FvwmAnimate
+lib/X11/fvwm2/${PKGVERSION}/FvwmAudio
+lib/X11/fvwm2/${PKGVERSION}/FvwmAuto
+lib/X11/fvwm2/${PKGVERSION}/FvwmBacker
+lib/X11/fvwm2/${PKGVERSION}/FvwmBanner
+lib/X11/fvwm2/${PKGVERSION}/FvwmButtons
+lib/X11/fvwm2/${PKGVERSION}/FvwmCascade
+lib/X11/fvwm2/${PKGVERSION}/FvwmCommandS
+lib/X11/fvwm2/${PKGVERSION}/FvwmConsole
+lib/X11/fvwm2/${PKGVERSION}/FvwmConsoleC
+lib/X11/fvwm2/${PKGVERSION}/FvwmConsoleC.pl
+lib/X11/fvwm2/${PKGVERSION}/FvwmCpp
+lib/X11/fvwm2/${PKGVERSION}/FvwmEvent
+lib/X11/fvwm2/${PKGVERSION}/FvwmForm
+lib/X11/fvwm2/${PKGVERSION}/FvwmIconMan
+lib/X11/fvwm2/${PKGVERSION}/FvwmIdent
+lib/X11/fvwm2/${PKGVERSION}/FvwmM4
+lib/X11/fvwm2/${PKGVERSION}/FvwmPager
+lib/X11/fvwm2/${PKGVERSION}/FvwmPerl
+lib/X11/fvwm2/${PKGVERSION}/FvwmProxy
+lib/X11/fvwm2/${PKGVERSION}/FvwmRearrange
+lib/X11/fvwm2/${PKGVERSION}/FvwmScript
+lib/X11/fvwm2/${PKGVERSION}/FvwmTalk
+lib/X11/fvwm2/${PKGVERSION}/FvwmTile
man/man1/FvwmAnimate.1
man/man1/FvwmAuto.1
man/man1/FvwmBacker.1
@@ -54,7 +47,6 @@ man/man1/FvwmConsoleC.pl.1
man/man1/FvwmCpp.1
man/man1/FvwmEvent.1
man/man1/FvwmForm.1
-${PLIST.gtk}man/man1/FvwmGtk.1
man/man1/FvwmIconMan.1
man/man1/FvwmIdent.1
man/man1/FvwmM4.1
@@ -132,6 +124,22 @@ share/fvwm2/default-config/images/icons/
share/fvwm2/default-config/images/icons/wallpaper.png
share/fvwm2/fvwm-menu-desktop-config.fpl
share/fvwm2/fvwm-script-ComExample.pl
+share/fvwm2/locale/ar/LC_MESSAGES/FvwmScript.mo
+share/fvwm2/locale/ar/LC_MESSAGES/fvwm.mo
+share/fvwm2/locale/da/LC_MESSAGES/FvwmScript.mo
+share/fvwm2/locale/da/LC_MESSAGES/fvwm.mo
+share/fvwm2/locale/de/LC_MESSAGES/FvwmScript.mo
+share/fvwm2/locale/de/LC_MESSAGES/fvwm.mo
+share/fvwm2/locale/es/LC_MESSAGES/FvwmScript.mo
+share/fvwm2/locale/es/LC_MESSAGES/fvwm.mo
+share/fvwm2/locale/fr/LC_MESSAGES/FvwmScript.mo
+share/fvwm2/locale/fr/LC_MESSAGES/fvwm.mo
+share/fvwm2/locale/ru/LC_MESSAGES/FvwmScript.mo
+share/fvwm2/locale/ru/LC_MESSAGES/fvwm.mo
+share/fvwm2/locale/sv_SE/LC_MESSAGES/FvwmScript.mo
+share/fvwm2/locale/sv_SE/LC_MESSAGES/fvwm.mo
+share/fvwm2/locale/zh_CN/LC_MESSAGES/FvwmScript.mo
+share/fvwm2/locale/zh_CN/LC_MESSAGES/fvwm.mo
share/fvwm2/perllib/FVWM/Commands.pm
share/fvwm2/perllib/FVWM/Constants.pm
share/fvwm2/perllib/FVWM/Event.pm
@@ -149,19 +157,4 @@ share/fvwm2/perllib/FVWM/Tracker/Schedul
share/fvwm2/perllib/FVWM/Tracker/WindowList.pm
share/fvwm2/perllib/General/FileSystem.pm
share/fvwm2/perllib/General/Parse.pm
-share/locale/ar/LC_MESSAGES/FvwmScript.mo
-share/locale/ar/LC_MESSAGES/fvwm.mo
-share/locale/da/LC_MESSAGES/FvwmScript.mo
-share/locale/da/LC_MESSAGES/fvwm.mo
-share/locale/de/LC_MESSAGES/FvwmScript.mo
-share/locale/de/LC_MESSAGES/fvwm.mo
-share/locale/es/LC_MESSAGES/FvwmScript.mo
-share/locale/es/LC_MESSAGES/fvwm.mo
-share/locale/fr/LC_MESSAGES/FvwmScript.mo
-share/locale/fr/LC_MESSAGES/fvwm.mo
-share/locale/ru/LC_MESSAGES/FvwmScript.mo
-share/locale/ru/LC_MESSAGES/fvwm.mo
-share/locale/sv_SE/LC_MESSAGES/FvwmScript.mo
-share/locale/sv_SE/LC_MESSAGES/fvwm.mo
-share/locale/zh_CN/LC_MESSAGES/FvwmScript.mo
-share/locale/zh_CN/LC_MESSAGES/fvwm.mo
+@pkgdir lib/X11/fvwm2/pixmaps
Index: pkgsrc/wm/fvwm/distinfo
diff -u pkgsrc/wm/fvwm/distinfo:1.10 pkgsrc/wm/fvwm/distinfo:1.11
--- pkgsrc/wm/fvwm/distinfo:1.10 Thu Oct 20 00:39:50 2022
+++ pkgsrc/wm/fvwm/distinfo Wed Jan 18 07:43:16 2023
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2022/10/20 00:39:50 gutteridge Exp $
+$NetBSD: distinfo,v 1.11 2023/01/18 07:43:16 vins Exp $
-BLAKE2s (fvwm-2.6.9.tar.gz) = 59e97f514d9192e4d8c6de287ab63a78ba6f742dfbce87597f26f6f5cf642915
-SHA512 (fvwm-2.6.9.tar.gz) = a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
-Size (fvwm-2.6.9.tar.gz) = 3942859 bytes
-SHA1 (patch-ab) = d9e960ed7be624a36af5a8a3ad4422f4ed4ce64e
+BLAKE2s (fvwm-2.7.0.tar.gz) = 193c01c6e3e111d04aa95ff51ee05552e709489dec8f65758ba4d93d290e767c
+SHA512 (fvwm-2.7.0.tar.gz) = fc9076c3f07f36b0b2c7c4d2bdf7bb1a711000e39316e327173548bc99dc2b8a29b591e3644e1492f87603b576cd4a3f58ecbdd84a4384d294417b3c56c81808
+Size (fvwm-2.7.0.tar.gz) = 3933529 bytes
+SHA1 (patch-configure) = cf3ddf755d3b6d509cf722ed21ac8fd6c0ed7408
SHA1 (patch-fvwm_events.c) = effd8fd31a3c1f28a3e71dbcb9569621d996cc31
-SHA1 (patch-fvwm_fvwm-reproducible.c) = 96515959482750a25bfe59e9a370d0ef0295bc89
+SHA1 (patch-fvwm_fvwm.c) = 96515959482750a25bfe59e9a370d0ef0295bc89
SHA1 (patch-libs_FEvent.c) = 358243d198251c6ea0bf546e31a94cb089355e45
SHA1 (patch-libs_FEvent.h) = 0dae96a21839945ac9627269608aa1bbafaa8d65
Index: pkgsrc/wm/fvwm/options.mk
diff -u pkgsrc/wm/fvwm/options.mk:1.10 pkgsrc/wm/fvwm/options.mk:1.11
--- pkgsrc/wm/fvwm/options.mk:1.10 Sat May 23 12:50:33 2020
+++ pkgsrc/wm/fvwm/options.mk Wed Jan 18 07:43:16 2023
@@ -1,19 +1,13 @@
-# $NetBSD: options.mk,v 1.10 2020/05/23 12:50:33 rillig Exp $
+# $NetBSD: options.mk,v 1.11 2023/01/18 07:43:16 vins Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.fvwm
-PKG_SUPPORTED_OPTIONS= gtk xrender xcursor xft2 fribidi debug svg
+PKG_SUPPORTED_OPTIONS= xrender xcursor xft2 fribidi debug svg
PKG_SUPPORTED_OPTIONS+= doc
PKG_SUGGESTED_OPTIONS+= svg xft2 xrender xcursor doc
-PKG_OPTIONS_LEGACY_VARS+= FVWM2_USE_GTK:gtk
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= gtk doc
-
-.if !empty(PKG_OPTIONS:Mgtk)
-. include "../../x11/gtk/buildlink3.mk"
-PLIST.gtk= yes
-.endif
+PLIST_VARS+= doc
.if !empty(PKG_OPTIONS:Mxcursor)
CONFIGURE_ARGS+= --enable-xcursor
Added files:
Index: pkgsrc/wm/fvwm/patches/patch-configure
diff -u /dev/null pkgsrc/wm/fvwm/patches/patch-configure:1.3
--- /dev/null Wed Jan 18 07:43:16 2023
+++ pkgsrc/wm/fvwm/patches/patch-configure Wed Jan 18 07:43:16 2023
@@ -0,0 +1,36 @@
+$NetBSD: patch-configure,v 1.3 2023/01/18 07:43:16 vins Exp $
+
+(1)
+Convert install path from fvwm to fvwm2
+This can not be done with
+CONFIGURE_ARGS+= --datarootdir=${PREFIX:Q}/share/fvwm2
+this will install fvwm2/fvwm.
+
+(2)
+Avoid following problem on NetBSD/amd64 with clang
++-----------------
+| conftest.c:38:3: error: non-void function 'main' should return a value [-Wreturn-type]
+| return;
+| ^
++-----------------
+
+--- configure.orig 2022-10-20 19:05:33.000000000 +0000
++++ configure
+@@ -609,7 +609,7 @@ MFLAGS=
+ MAKEFLAGS=
+
+ # Identity of this package.
+-PACKAGE_NAME='fvwm'
++PACKAGE_NAME='fvwm2'
+ PACKAGE_TARNAME='fvwm'
+ PACKAGE_VERSION='2.7.0'
+ PACKAGE_STRING='fvwm 2.7.0'
+@@ -3698,7 +3698,7 @@ fi
+
+
+ # Define the identity of the package.
+- PACKAGE='fvwm'
++ PACKAGE='fvwm2'
+ VERSION='2.7.0'
+
+
Index: pkgsrc/wm/fvwm/patches/patch-fvwm_fvwm.c
diff -u /dev/null pkgsrc/wm/fvwm/patches/patch-fvwm_fvwm.c:1.1
--- /dev/null Wed Jan 18 07:43:16 2023
+++ pkgsrc/wm/fvwm/patches/patch-fvwm_fvwm.c Wed Jan 18 07:43:16 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-fvwm_fvwm.c,v 1.1 2023/01/18 07:43:16 vins Exp $
+
+Remove compile time __DATE__ and __TIME__ variables from the source.
+
+It looks like upstream rejected the request for inclusion in
+https://github.com/fvwmorg/fvwm/issues/67 and focuses on fvwm3 fixes.
+This patch has been taken from a similar (but not applying as-is) patch
+by robert@openbsd for OpenBSD's Xenocara tree FVWM version.
+
+--- fvwm/fvwm.c~
++++ fvwm/fvwm.c
+@@ -1286,8 +1286,8 @@ static void setVersionInfo(void)
+ int support_len;
+
+ /* Set version information string */
+- sprintf(version_str, "fvwm %s%s compiled on %s at %s",
+- VERSION, VERSIONINFO, __DATE__, __TIME__);
++ sprintf(version_str, "fvwm %s%s\n",
++ VERSION, VERSIONINFO);
+ Fvwm_VersionInfo = safestrdup(version_str);
+
+ sprintf(license_str,
Home |
Main Index |
Thread Index |
Old Index