svn commit: r469574 - in head/x11-wm/fluxbox: . files

[Alan Somers]

Author: asomers (src committer)
Date: Thu May 10 20:02:33 2018
New Revision: 469574
URL: https://svnweb.freebsd.org/changeset/ports/469574

Log:
  x11-wm/fluxbox: x11-wm/fluxbox: apply upstream patch for multiple bugs
  
  Fixes upstream bugs 1058, 1102, 1111, and 1140.  Fluxbox hasn't made a
  release for 3 years, so we should stop waiting and patch our ports tree.
  
  https://github.com/fluxbox/fluxbox/commit/dcdde4d32c93d01df205bc06d7dfcbd356be031f
  https://sourceforge.net/p/fluxbox/bugs/1140/
  https://sourceforge.net/p/fluxbox/bugs/1111/
  https://sourceforge.net/p/fluxbox/bugs/1102/
  https://sourceforge.net/p/fluxbox/bugs/1058/
  
  PR:		227792
  Approved by:	maintainer timeout (jgh)

Added:
  head/x11-wm/fluxbox/files/patch-src_FbRootWindow.cc   (contents, props changed)
  head/x11-wm/fluxbox/files/patch-src_FbRootWindow.hh   (contents, props changed)
  head/x11-wm/fluxbox/files/patch-src_FbWinFrame.cc   (contents, props changed)
  head/x11-wm/fluxbox/files/patch-src_Screen.cc   (contents, props changed)
Modified:
  head/x11-wm/fluxbox/Makefile

Modified: head/x11-wm/fluxbox/Makefile
==============================================================================
--- head/x11-wm/fluxbox/Makefile	Thu May 10 19:43:33 2018	(r469573)
+++ head/x11-wm/fluxbox/Makefile	Thu May 10 20:02:33 2018	(r469574)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	1.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

Added: head/x11-wm/fluxbox/files/patch-src_FbRootWindow.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/fluxbox/files/patch-src_FbRootWindow.cc	Thu May 10 20:02:33 2018	(r469574)
@@ -0,0 +1,24 @@
+--- src/FbRootWindow.cc.orig	2015-02-08 10:44:45 UTC
++++ src/FbRootWindow.cc
+@@ -30,7 +30,8 @@ FbRootWindow::FbRootWindow(int screen_num):
+     m_colormap(0),
+     m_decorationDepth(0),
+     m_decorationVisual(0),
+-    m_decorationColormap(0) {
++    m_decorationColormap(0),
++    m_maxDepth(depth()) {
+ 
+     Display *disp = FbTk::App::instance()->display();
+ 
+@@ -55,9 +56,9 @@ FbRootWindow::FbRootWindow(int screen_num):
+ 
+         for (int i = 0; i < vinfo_nitems; i++) {
+             if ((DefaultDepth(disp, screen_num) < vinfo_return[i].depth)
+-                    && (static_cast<int>(depth()) < vinfo_return[i].depth)){
++                    && (m_maxDepth < vinfo_return[i].depth)){
+                 m_visual = vinfo_return[i].visual;
+-                setDepth(vinfo_return[i].depth);
++                m_maxDepth = vinfo_return[i].depth;
+             }
+ 
+             if((m_decorationDepth < vinfo_return[i].depth)

Added: head/x11-wm/fluxbox/files/patch-src_FbRootWindow.hh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/fluxbox/files/patch-src_FbRootWindow.hh	Thu May 10 20:02:33 2018	(r469574)
@@ -0,0 +1,18 @@
+--- src/FbRootWindow.hh.orig	2015-02-08 10:44:45 UTC
++++ src/FbRootWindow.hh
+@@ -41,6 +41,7 @@ class FbRootWindow: public FbTk::FbWindow { (public)
+     int decorationDepth() const { return m_decorationDepth; }
+     Visual *decorationVisual() const { return m_decorationVisual; }
+     Colormap decorationColormap() const { return m_decorationColormap; }
++    int maxDepth() const { return m_maxDepth; }
+ 
+ private:
+     Visual *m_visual;
+@@ -49,6 +50,7 @@ class FbRootWindow: public FbTk::FbWindow { (public)
+     int m_decorationDepth;
+     Visual *m_decorationVisual;
+     Colormap m_decorationColormap;
++    int m_maxDepth;
+ };
+ 
+ #endif // FBROOTWINDOW_HH

Added: head/x11-wm/fluxbox/files/patch-src_FbWinFrame.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/fluxbox/files/patch-src_FbWinFrame.cc	Thu May 10 20:02:33 2018	(r469574)
@@ -0,0 +1,13 @@
+--- src/FbWinFrame.cc.orig	2015-02-08 10:44:45 UTC
++++ src/FbWinFrame.cc
+@@ -115,8 +115,8 @@ FbWinFrame::FbWinFrame(BScreen &screen, unsigned int c
+     m_state(state),
+     m_window(theme->screenNum(), state.x, state.y, state.width, state.height, s_mask, true, false,
+         client_depth, InputOutput,
+-        ((client_depth == 32) && (screen.rootWindow().depth() == 32) ? screen.rootWindow().visual() : CopyFromParent),
+-        ((client_depth == 32) && (screen.rootWindow().depth() == 32) ? screen.rootWindow().colormap() : CopyFromParent)),
++        (client_depth == screen.rootWindow().maxDepth() ? screen.rootWindow().visual() : CopyFromParent),
++        (client_depth == screen.rootWindow().maxDepth() ? screen.rootWindow().colormap() : CopyFromParent)),
+     m_layeritem(window(), *screen.layerManager().getLayer(ResourceLayer::NORMAL)),
+     m_titlebar(m_window, 0, 0, 100, 16, s_mask, false, false, 
+         screen.rootWindow().decorationDepth(), InputOutput,

Added: head/x11-wm/fluxbox/files/patch-src_Screen.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/fluxbox/files/patch-src_Screen.cc	Thu May 10 20:02:33 2018	(r469574)
@@ -0,0 +1,11 @@
+--- src/Screen.cc.orig	2015-02-08 10:44:45 UTC
++++ src/Screen.cc
+@@ -297,7 +297,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
+                             "using visual 0x%lx, depth %d\n",
+                             "informational message saying screen number (%d), visual (%lx), and colour depth (%d)").c_str(),
+             screenNumber(), XVisualIDFromVisual(rootWindow().visual()),
+-            rootWindow().depth());
++            rootWindow().maxDepth());
+ #endif // DEBUG
+ 
+     FbTk::EventManager *evm = FbTk::EventManager::instance();