Attachment 192829 Details for Bug 227792 – Apply upstream patch for PR 227792

[patch] Apply upstream patch for PR 227792

pr227792.diff (text/plain), 5.89 KB, created by Alan Somers on 2018-04-26 16:04:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Somers

Created: 2018-04-26 16:04:20 UTC

Size: 5.89 KB

patch

obsolete

>Index: x11-wm/fluxbox/Makefile
>===================================================================
>--- x11-wm/fluxbox/Makefile	(revision 468355)
>+++ x11-wm/fluxbox/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	fluxbox
> PORTVERSION=	1.3.7
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	x11-wm
> MASTER_SITES=	SF
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>Index: x11-wm/fluxbox/files/patch-src_FbRootWindow.cc
>===================================================================
>--- x11-wm/fluxbox/files/patch-src_FbRootWindow.cc	(nonexistent)
>+++ x11-wm/fluxbox/files/patch-src_FbRootWindow.cc	(working copy)
>@@ -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)
>
>Property changes on: x11-wm/fluxbox/files/patch-src_FbRootWindow.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: x11-wm/fluxbox/files/patch-src_FbRootWindow.hh
>===================================================================
>--- x11-wm/fluxbox/files/patch-src_FbRootWindow.hh	(nonexistent)
>+++ x11-wm/fluxbox/files/patch-src_FbRootWindow.hh	(working copy)
>@@ -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
>
>Property changes on: x11-wm/fluxbox/files/patch-src_FbRootWindow.hh
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: x11-wm/fluxbox/files/patch-src_FbWinFrame.cc
>===================================================================
>--- x11-wm/fluxbox/files/patch-src_FbWinFrame.cc	(nonexistent)
>+++ x11-wm/fluxbox/files/patch-src_FbWinFrame.cc	(working copy)
>@@ -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,
>
>Property changes on: x11-wm/fluxbox/files/patch-src_FbWinFrame.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: x11-wm/fluxbox/files/patch-src_Screen.cc
>===================================================================
>--- x11-wm/fluxbox/files/patch-src_Screen.cc	(nonexistent)
>+++ x11-wm/fluxbox/files/patch-src_Screen.cc	(working copy)
>@@ -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();
>
>Property changes on: x11-wm/fluxbox/files/patch-src_Screen.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

asomers: maintainer-approval?

Actions: View | Diff

Attachments on bug 227792: 192829