diff options
| author | Norikatsu Shigemura <nork@FreeBSD.org> | 2003-04-11 16:45:18 +0000 |
|---|---|---|
| committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2003-04-11 16:45:18 +0000 |
| commit | a008ff7c18972920294634ee7057fdcc5fc07746 (patch) | |
| tree | 0f8c04eb44b62fc4bdf20ffd19f9b4bf829575b2 /x11-wm | |
| parent | b233f5dbd88ac79cc03376aac6a2256d2e642429 (diff) | |
| download | ports-a008ff7c18972920294634ee7057fdcc5fc07746.tar.gz ports-a008ff7c18972920294634ee7057fdcc5fc07746.zip | |
o fix crash on sticky windows if compiled with Remember patch
(update patch to -7)
o fix misbehaviour of tabber windows (patch approved by fluxgen)
PR: ports/50204
Submitted by: Pav Lucistnik <pav@oook.cz>
Tested by: Hendrik Scholz <hscholz@raisdorf.net>
Approved by: maintainer no response (about 2 month)
Patch approved by: fluxgen (fluxbox developer)
Notes
Notes:
svn path=/head/; revision=78744
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/fluxbox-devel/Makefile | 4 | ||||
| -rw-r--r-- | x11-wm/fluxbox-devel/distinfo | 2 | ||||
| -rw-r--r-- | x11-wm/fluxbox-devel/files/patch-src-Tab.cc | 19 | ||||
| -rw-r--r-- | x11-wm/fluxbox/Makefile | 4 | ||||
| -rw-r--r-- | x11-wm/fluxbox/distinfo | 2 | ||||
| -rw-r--r-- | x11-wm/fluxbox/files/patch-src-Tab.cc | 19 |
6 files changed, 44 insertions, 6 deletions
diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile index dbda9366c8c8..5a4dfaf885f8 100644 --- a/x11-wm/fluxbox-devel/Makefile +++ b/x11-wm/fluxbox-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= fluxbox PORTVERSION= 0.1.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} .if defined(WITH_REMEMBER) PATCH_SITES= http://www.bugfactory.org/~gav/fluxbox/ PATCH_DIST_STRIP= -p1 -PATCHFILES= remember-0.1.14-4.gz +PATCHFILES= remember-0.1.14-7.gz .endif MAINTAINER= hendrik@scholz.net diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo index 8b719ab64583..9bebf9e97e17 100644 --- a/x11-wm/fluxbox-devel/distinfo +++ b/x11-wm/fluxbox-devel/distinfo @@ -1,3 +1,3 @@ MD5 (fluxbox-0.1.14.tar.gz) = f097b97127461fa3f6f4af4048c75cfc -MD5 (remember-0.1.14-4.gz) = 437e2edd16e57a1a9f113c5e1f936709 +MD5 (remember-0.1.14-7.gz) = b947ac97404d000377cac7ff35a7979e MD5 (winsnap-0.1.14.patch) = 519a70da183a23ed88bab2f95ee07505 diff --git a/x11-wm/fluxbox-devel/files/patch-src-Tab.cc b/x11-wm/fluxbox-devel/files/patch-src-Tab.cc new file mode 100644 index 000000000000..81749dda5c2b --- /dev/null +++ b/x11-wm/fluxbox-devel/files/patch-src-Tab.cc @@ -0,0 +1,19 @@ +--- src/Tab.cc.orig Tue Feb 25 03:00:22 2003 ++++ src/Tab.cc Tue Feb 25 03:01:31 2003 +@@ -1011,14 +1011,14 @@ + Fluxbox *fluxbox = Fluxbox::instance(); + if (m_prev) { //if this have a chain to "the left" (previous tab) then set it's next to this next + m_prev->m_next = m_next; +- if(!m_next && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window ++ if(!m_next && !m_prev->m_prev && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window + m_prev->m_win->setTab(false); + else + tmp = m_prev; + } + if (m_next) { //if this have a chain to "the right" (next tab) then set it's prev to this prev + m_next->m_prev = m_prev; +- if(!m_prev && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window ++ if(!m_prev && !m_next->m_next && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window + m_next->m_win->setTab(false); + else + tmp = m_next; diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile index dbda9366c8c8..5a4dfaf885f8 100644 --- a/x11-wm/fluxbox/Makefile +++ b/x11-wm/fluxbox/Makefile @@ -7,7 +7,7 @@ PORTNAME= fluxbox PORTVERSION= 0.1.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} .if defined(WITH_REMEMBER) PATCH_SITES= http://www.bugfactory.org/~gav/fluxbox/ PATCH_DIST_STRIP= -p1 -PATCHFILES= remember-0.1.14-4.gz +PATCHFILES= remember-0.1.14-7.gz .endif MAINTAINER= hendrik@scholz.net diff --git a/x11-wm/fluxbox/distinfo b/x11-wm/fluxbox/distinfo index 8b719ab64583..9bebf9e97e17 100644 --- a/x11-wm/fluxbox/distinfo +++ b/x11-wm/fluxbox/distinfo @@ -1,3 +1,3 @@ MD5 (fluxbox-0.1.14.tar.gz) = f097b97127461fa3f6f4af4048c75cfc -MD5 (remember-0.1.14-4.gz) = 437e2edd16e57a1a9f113c5e1f936709 +MD5 (remember-0.1.14-7.gz) = b947ac97404d000377cac7ff35a7979e MD5 (winsnap-0.1.14.patch) = 519a70da183a23ed88bab2f95ee07505 diff --git a/x11-wm/fluxbox/files/patch-src-Tab.cc b/x11-wm/fluxbox/files/patch-src-Tab.cc new file mode 100644 index 000000000000..81749dda5c2b --- /dev/null +++ b/x11-wm/fluxbox/files/patch-src-Tab.cc @@ -0,0 +1,19 @@ +--- src/Tab.cc.orig Tue Feb 25 03:00:22 2003 ++++ src/Tab.cc Tue Feb 25 03:01:31 2003 +@@ -1011,14 +1011,14 @@ + Fluxbox *fluxbox = Fluxbox::instance(); + if (m_prev) { //if this have a chain to "the left" (previous tab) then set it's next to this next + m_prev->m_next = m_next; +- if(!m_next && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window ++ if(!m_next && !m_prev->m_prev && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window + m_prev->m_win->setTab(false); + else + tmp = m_prev; + } + if (m_next) { //if this have a chain to "the right" (next tab) then set it's prev to this prev + m_next->m_prev = m_prev; +- if(!m_prev && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window ++ if(!m_prev && !m_next->m_next && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window + m_next->m_win->setTab(false); + else + tmp = m_next; |