01.01.2023 12:41, Landry Breuil пишет: > Le Sat, Dec 31, 2022 at 12:22:47PM +0000, Klemens Nanni a écrit : >> xfc4-wavelan spams ~/.xsession with state changes which stems from the >> xfce DBG macro which gets defined when the DEBUG macro is set, which >> comes from --enable-debug that is currently passed for every port using >> XFCE_COMMIT. >> >> landry pointed out the XFCE_COMMIT/--enable-debug connection and >> suggested a DEBUG test -- I failed to look at xfce4.port.mk in the first >> place. >> >> Only four ports use a commit, so bumping them is easy to pick up >> potential object changes. >> >> Feeback? Objection? OK? > > I've had a second look at what --enable-maintainer-mode does and it's > still a bit fuzzy to me, but orage port builds fine without it. So i'd > completely move the CONFIGURE_ARGS line adding --enable-maintainer-mode > --enable-debug to the .if defined(DEBUG) block outside of the .if > defined(XFCE_COMMIT) block, this way all ports can be built with debug > macros enable via make DEBUG=-g.
Sure. > Dunno if it's a good idea though to link that behaviour it to the ports > framework DEBUG variable, but we cant add --enable-debug to > DEBUG_CONFIGURE_ARGS since it'd enable debug macros globally & > inconditionally. Quite a few ports already use DEBUG as condition, I'm not aware of any other mechanism. And yes, DEBUG_CONFIGURE_ARGS is out of question, as you explained. > i had another look at --enable-debug in aclocal.m4 which is used in all > xfce projects, from > https://gitlab.xfce.org/xfce/xfce4-dev-tools/-/blob/master/m4macros/xdt-features.m4#L61: > - it also enables some -W flags too, some might lead to build failures > - the DBG macros are enabled for yes/full in the enable-debug values (eg > no|minimum|yes|full, minimum being the > default) So a minimal fix would be to keep the logic as is and pass =minimum, but I don't think that's appropiate. OK? Index: xfce4.port.mk =================================================================== RCS file: /cvs/ports/x11/xfce4/xfce4.port.mk,v retrieving revision 1.37 diff -u -p -r1.37 xfce4.port.mk --- xfce4.port.mk 15 Dec 2022 14:43:16 -0000 1.37 +++ xfce4.port.mk 1 Jan 2023 10:36:11 -0000 @@ -79,7 +79,6 @@ PORTROACH+= limitw:1,even .if defined(XFCE_COMMIT) DISTNAME = ${DISTNAME_GIT} MASTER_SITES = ${MASTER_SITES_GIT} -CONFIGURE_ARGS += --enable-maintainer-mode --enable-debug AUTOMAKE_VERSION = 1.14 AUTOCONF_VERSION = 2.69 MODXFCE4_gen = cd ${WRKSRC} && env NOCONFIGURE=yes \ @@ -89,6 +88,10 @@ BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPEN ${MODGNU_AUTOMAKE_DEPENDS} \ x11/xfce4/xfce4-dev-tools +.endif + +.if defined(DEBUG) +CONFIGURE_ARGS += --enable-maintainer-mode --enable-debug .endif # remove useless .la file Index: orage/Makefile =================================================================== RCS file: /cvs/ports/x11/xfce4/orage/Makefile,v retrieving revision 1.66 diff -u -p -r1.66 Makefile --- orage/Makefile 25 Dec 2022 07:16:37 -0000 1.66 +++ orage/Makefile 31 Dec 2022 12:15:16 -0000 @@ -3,6 +3,7 @@ COMMENT= Xfce4 calendar XFCE_VERSION= 4.17.0pre0 XFCE_COMMIT= cf27a483c40188bb XFCE_GOODIE= orage +REVISION= 0 # GPLv2 PERMIT_PACKAGE= Yes Index: xfce4-mixer/Makefile =================================================================== RCS file: /cvs/ports/x11/xfce4/xfce4-mixer/Makefile,v retrieving revision 1.62 diff -u -p -r1.62 Makefile --- xfce4-mixer/Makefile 21 Dec 2022 09:15:26 -0000 1.62 +++ xfce4-mixer/Makefile 31 Dec 2022 12:14:17 -0000 @@ -3,6 +3,7 @@ COMMENT= Xfce4 volume mixer XFCE_GOODIE= xfce4-mixer XFCE_VERSION= 4.18.0pre0 XFCE_COMMIT= a71951036481ca08a670ad8bf3cd107d37bfb774 +REVISION= 0 # GPLv2 PERMIT_PACKAGE= Yes Index: xfce4-taskmanager/Makefile =================================================================== RCS file: /cvs/ports/x11/xfce4/xfce4-taskmanager/Makefile,v retrieving revision 1.41 diff -u -p -r1.41 Makefile --- xfce4-taskmanager/Makefile 27 Dec 2022 09:14:37 -0000 1.41 +++ xfce4-taskmanager/Makefile 31 Dec 2022 12:15:24 -0000 @@ -3,7 +3,7 @@ COMMENT= Xfce4 task manager and system m XFCE_VERSION= 1.5.5 XFCE_COMMIT= c4564879 XFCE_GOODIE= xfce4-taskmanager -REVISION= 0 +REVISION= 1 # GPLv2 PERMIT_PACKAGE= Yes Index: xfce4-wavelan/Makefile =================================================================== RCS file: /cvs/ports/x11/xfce4/xfce4-wavelan/Makefile,v retrieving revision 1.53 diff -u -p -r1.53 Makefile --- xfce4-wavelan/Makefile 23 Dec 2022 08:03:10 -0000 1.53 +++ xfce4-wavelan/Makefile 31 Dec 2022 12:15:04 -0000 @@ -3,7 +3,7 @@ COMMENT= Xfce4 wireless interface monito XFCE_VERSION= 0.6.3 XFCE_PLUGIN= wavelan XFCE_COMMIT= 56657a9cc08ce4da022db9233dcf3241aaf13794 -REVISION= 4 +REVISION= 5 # BSD PERMIT_PACKAGE= Yes
