sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

1. Update 2.5.12 --> 2.5.13.

Browse source 
2.  Register conflicts.
3.  Set default ImagePath in system.fvwm2rc.

PR:		59165
This commit is contained in:
Cy Schubert 2005-07-17 03:47:53 +00:00
parent bbe2a03d8e
commit c000ff0517
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=139389
3 changed files with 5 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
x11-wm/fvwm2-devel/Makefile
View file

@ -6,8 +6,7 @@
# #
PORTNAME= fvwm PORTNAME= fvwm
PORTVERSION= 2.5.12 PORTVERSION= 2.5.13
PORTREVISION= 1
CATEGORIES= x11-wm CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/ http://www.fvwm.org/generated/icon_download/
@ -37,6 +36,8 @@ RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS+= stroke.0:${PORTSDIR}/devel/libstroke LIB_DEPENDS+= stroke.0:${PORTSDIR}/devel/libstroke
.endif .endif
# Other ports this port cannot coexist with
CONFLICTS?= fvwm-1.* fvwm-2.4.*
NO_LATEST_LINK= yes NO_LATEST_LINK= yes
USE_REINPLACE= yes USE_REINPLACE= yes
USE_GMAKE= yes USE_GMAKE= yes

4
x11-wm/fvwm2-devel/distinfo
View file

@ -1,4 +1,4 @@
MD5 (fvwm-2.5.12.tar.bz2) = f323c59c2becb6766648b25b2111501c MD5 (fvwm-2.5.13.tar.bz2) = b95df3d751da3f5fc803a117de758723
SIZE (fvwm-2.5.12.tar.bz2) = 1917317 SIZE (fvwm-2.5.13.tar.bz2) = 1936745
MD5 (fvwm_icons.tgz) = de6c2822f1f6d43a0e1daddd0c7a8665 MD5 (fvwm_icons.tgz) = de6c2822f1f6d43a0e1daddd0c7a8665
SIZE (fvwm_icons.tgz) = 363406 SIZE (fvwm_icons.tgz) = 363406

36
x11-wm/fvwm2-devel/files/patch-fvwm::icons.c
View file

@ -1,36 +0,0 @@
--- fvwm/icons.c.orig Wed Mar 17 09:42:54 2004
+++ fvwm/icons.c Tue Oct 19 16:13:55 2004
@@ -2251,7 +2251,7 @@
*/
void DeIconify(FvwmWindow *fw)
{
- FvwmWindow *t,*tmp;
+ FvwmWindow *t, *tmp, *ofw;
FvwmWindow *sf = get_focus_window();
rectangle icon_rect;
XWindowAttributes winattrs = {0};
@@ -2276,15 +2276,18 @@
SET_ICONIFY_AFTER_MAP(fw, 0);
return;
}
- while (IS_ICONIFIED_BY_PARENT(fw))
+ for (ofw = NULL; fw != ofw && IS_ICONIFIED_BY_PARENT(fw); )
{
- for (t = Scr.FvwmRoot.next; t != NULL; t = t->next)
+ t = get_transientfor_fvwmwindow(fw);
+ if (t != NULL)
{
- if (t != fw && FW_W_TRANSIENTFOR(fw) == FW_W(t))
- {
- fw = t;
- }
+ ofw = fw;
+ fw = t;
}
+ }
+ if (IS_ICONIFIED_BY_PARENT(fw))
+ {
+ SET_ICONIFIED_BY_PARENT(fw, 0);
}
/* AS dje RaiseWindow(fw); */