Index: head/x11-wm/fluxbox/Makefile =================================================================== --- head/x11-wm/fluxbox/Makefile (revision 378404) +++ head/x11-wm/fluxbox/Makefile (revision 378405) @@ -1,156 +1,157 @@ # Created by: spn # $FreeBSD$ PORTNAME= fluxbox PORTVERSION= 1.3.6 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= SF DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= beat@FreeBSD.org COMMENT= Small and fast window manager based on BlackBox LICENSE= MIT RUN_DEPENDS= xmessage:${PORTSDIR}/x11/xmessage LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi USE_XORG= xextproto xft xpm xrandr USES= gmake pkgconfig WANT_GNOME= yes GNU_CONFIGURE= yes PORTDOCS= AUTHORS ChangeLog NEWS README TODO DOCSVERSION= 20060629 OPTIONS_DEFINE= DOCS DOCHTML PDFDOCS DEBUG GNOME IMLIB2 XINERAMA \ XRENDER NLS SLIT SYSTRAY REMEMBER TOOLBAR OPTIONS_DEFAULT= XRENDER SLIT SYSTRAY REMEMBER TOOLBAR 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 .include .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif .if ${PORT_OPTIONS:MDOCHTML} # http://fluxbox.org/docbook/en/tarballs/ MASTER_SITES+= ${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:html \ http://people.freebsd.org/~mezz/distfiles/:html DISTFILES+= fb-doc-mfhtml-${DOCSVERSION}.tgz:html EXTRACT_ONLY+= fb-doc-mfhtml-${DOCSVERSION}.tgz PLIST_SUB+= DOCHTML="" .else PLIST_SUB+= DOCHTML="@comment " .endif .if ${PORT_OPTIONS:MPDFDOCS} # http://fluxbox.org/docbook/en/pdf/ MASTER_SITES+= ${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:pdf \ http://people.freebsd.org/~mezz/distfiles/:pdf DISTFILES+= fluxbook-${DOCSVERSION}.pdf:pdf PLIST_SUB+= DOCPDF="" .else PLIST_SUB+= DOCPDF="@comment " .endif .if ${PORT_OPTIONS:MIMLIB2} LIB_DEPENDS+= libImlib2.so:${PORTSDIR}/graphics/imlib2 CONFIGURE_ARGS+= --enable-imlib2 .else CONFIGURE_ARGS+= --disable-imlib2 .endif .if ${PORT_OPTIONS:MXINERAMA} || defined(PACKAGE_BUILDING) USE_XORG+= xinerama CONFIGURE_ARGS+= --enable-xinerama .endif .if ${PORT_OPTIONS:MNLS} USES+= iconv CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" .else CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MREMEMBER} CONFIGURE_ARGS+= --enable-remember .else CONFIGURE_ARGS+= --disable-remember .endif .if ${PORT_OPTIONS:MSLIT} CONFIGURE_ARGS+= --enable-slit .else CONFIGURE_ARGS+= --disable-slit .endif .if ${PORT_OPTIONS:MSYSTRAY} CONFIGURE_ARGS+= --enable-systray .else CONFIGURE_ARGS+= --disable-systray .endif .if ${PORT_OPTIONS:MTOOLBAR} CONFIGURE_ARGS+= --enable-toolbar .else CONFIGURE_ARGS+= --disable-toolbar .endif .if ${PORT_OPTIONS:MXRENDER} USE_XORG+= xrender CONFIGURE_ARGS+= --enable-xrender .else CONFIGURE_ARGS+= --disable-xrender .endif .include .if ${HAVE_GNOME:Mlibgnome}!="" || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-gnome .else CONFIGURE_ARGS+= --disable-gnome .endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/util/fluxbox-generate_menu.in ${WRKSRC}/util/fbsetbg .if ! ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e 's|HAVE_ICONV=yes|HAVE_ICONV=no|g' \ ${WRKSRC}/configure .endif post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MPDFDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf ${INSTALL_DATA} ${DISTDIR}/fluxbook-${DOCSVERSION}.pdf \ ${STAGEDIR}${DOCSDIR}/pdf/ .endif .if ${PORT_OPTIONS:MDOCHTML} @${MKDIR} ${STAGEDIR}${DOCSDIR}/html . for h in *.css *.html (cd ${WRKDIR}/html && ${INSTALL_DATA} ${h} ${STAGEDIR}${DOCSDIR}/html) . endfor .endif .include Index: head/x11-wm/fluxbox/files/patch-src__FbTk__TextButton.cc =================================================================== --- head/x11-wm/fluxbox/files/patch-src__FbTk__TextButton.cc (nonexistent) +++ head/x11-wm/fluxbox/files/patch-src__FbTk__TextButton.cc (revision 378405) @@ -0,0 +1,21 @@ +--- src/FbTk/TextButton.cc 2015-01-28 11:12:27.000000000 +0200 ++++ src/FbTk/TextButton.cc 2015-01-28 11:14:03.000000000 +0200 +@@ -143,11 +143,17 @@ + unsigned int textlen = visual.size(); + unsigned int button_width = width(); + unsigned int button_height = height(); ++ const int max_width = static_cast(button_width) - x_offset - ++ m_left_padding - m_right_padding; ++ ++ if (max_width <= bevel()) { ++ return; ++ } + + translateSize(m_orientation, button_width, button_height); + + // horizontal alignment, cut off text if needed +- int align_x = FbTk::doAlignment(button_width - x_offset - m_left_padding - m_right_padding, ++ int align_x = FbTk::doAlignment(max_width, + bevel(), justify(), font(), + visual.data(), visual.size(), + textlen); // return new text len Property changes on: head/x11-wm/fluxbox/files/patch-src__FbTk__TextButton.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