Index: head/x11-wm/fluxbox/Makefile =================================================================== --- head/x11-wm/fluxbox/Makefile (revision 469573) +++ head/x11-wm/fluxbox/Makefile (revision 469574) @@ -1,92 +1,92 @@ # Created by: spn # $FreeBSD$ PORTNAME= fluxbox PORTVERSION= 1.3.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= SF DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= jgh@FreeBSD.org COMMENT= Small and fast window manager based on BlackBox LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= xmessage:x11/xmessage LIB_DEPENDS= libfribidi.so:converters/fribidi \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig USE_XORG= x11 xext xextproto xft xpm xrandr USES= gmake pkgconfig GNU_CONFIGURE= yes PORTDATA= * PORTDOCS= * DOCSVERSION= 20060629 OPTIONS_DEFINE= DOCS DOCHTML PDFDOCS DEBUG IMLIB2 XINERAMA \ XRENDER NLS SLIT SYSTRAY REMEMBER TOOLBAR OPTIONS_DEFAULT= XRENDER SLIT SYSTRAY REMEMBER TOOLBAR XINERAMA DOCHTML_DESC= Install html documentation PDFDOCS_DESC= Build and install PDF documentation REMEMBER_DESC= Enable remember feature SLIT_DESC= Enable slit feature SYSTRAY_DESC= Enable systray feature TOOLBAR_DESC= Enable toolbar feature XRENDER_DESC= Enable xrender support DEBUG_CONFIGURE_ON= --enable-debug IMLIB2_CONFIGURE_ENABLE= imlib2 IMLIB2_LIB_DEPENDS= libImlib2.so:graphics/imlib2 NLS_CONFIGURE_ENABLE= nls NLS_USES= iconv NLS_VARS= CPPFLAGS+="-I${LOCALBASE}/include" LIBS+="-L${LOCALBASE}/lib ${ICONV_LIB}" NLS_VARS_OFF= CPPFLAGS+="-I${LOCALBASE}/include" LIBS+="-L${LOCALBASE}/lib" REMEMBER_CONFIGURE_ENABLE= remember SLIT_CONFIGURE_ENABLE= slit SYSTRAY_CONFIGURE_ENABLE= systray TOOLBAR_CONFIGURE_ENABLE= toolbar XINERAMA_CONFIGURE_ENABLE= xinerama XINERAMA_USE= XORG=xinerama XRENDER_USE= XORG=xrender XRENDER_CONFIGURE_ENABLE= xrender # http://fluxbox.org/docbook/en/tarballs/ DOCHTML_MASTER_SITES= LOCAL/mezz:html \ http://people.freebsd.org/~mezz/distfiles/:html DOCHTML_DISTFILES= fb-doc-mfhtml-${DOCSVERSION}.tgz:html DOCHTML_EXTRACT_ONLY= fb-doc-mfhtml-${DOCSVERSION}.tgz # http://fluxbox.org/docbook/en/pdf/ PDFDOCS_MASTER_SITES= LOCAL/mezz:pdf \ http://people.freebsd.org/~mezz/distfiles/:pdf PDFDOCS_DISTFILES= fluxbook-${DOCSVERSION}.pdf:pdf post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/util/fluxbox-generate_menu.in ${WRKSRC}/util/fbsetbg post-patch-NLS-off: @${REINPLACE_CMD} -e 's|iconv_works=yes|iconv_works=no|' \ ${WRKSRC}/configure post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS ChangeLog NEWS README TODO" \ ${STAGEDIR}${DOCSDIR}) post-install-PDFDOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf ${INSTALL_DATA} ${DISTDIR}/fluxbook-${DOCSVERSION}.pdf \ ${STAGEDIR}${DOCSDIR}/pdf/ post-install-DOCHTML-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/html . for h in *.css *.html (cd ${WRKDIR}/html && ${INSTALL_DATA} ${h} ${STAGEDIR}${DOCSDIR}/html) . endfor .include Index: head/x11-wm/fluxbox/files/patch-src_FbRootWindow.cc =================================================================== --- head/x11-wm/fluxbox/files/patch-src_FbRootWindow.cc (nonexistent) +++ head/x11-wm/fluxbox/files/patch-src_FbRootWindow.cc (revision 469574) @@ -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(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: head/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: head/x11-wm/fluxbox/files/patch-src_FbRootWindow.hh =================================================================== --- head/x11-wm/fluxbox/files/patch-src_FbRootWindow.hh (nonexistent) +++ head/x11-wm/fluxbox/files/patch-src_FbRootWindow.hh (revision 469574) @@ -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: head/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: head/x11-wm/fluxbox/files/patch-src_FbWinFrame.cc =================================================================== --- head/x11-wm/fluxbox/files/patch-src_FbWinFrame.cc (nonexistent) +++ head/x11-wm/fluxbox/files/patch-src_FbWinFrame.cc (revision 469574) @@ -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: head/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: head/x11-wm/fluxbox/files/patch-src_Screen.cc =================================================================== --- head/x11-wm/fluxbox/files/patch-src_Screen.cc (nonexistent) +++ head/x11-wm/fluxbox/files/patch-src_Screen.cc (revision 469574) @@ -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: head/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