Re: fluxbox-1.3.7 (Was: UPDATE: x11/fluxbox 1.3.5 => 1.3.6)
>
>> From: David Coppa
>> Date: Wed, Jan 21, 2015 at 9:22 AM
>> Subject: Re: UPDATE: x11/fluxbox 1.3.5 => 1.3.6
>> To: janis
>> Cc: OpenBSD Ports , Brian Callahan
>>
>>
>> On Wed, Jan 21, 2015 at 9:13 AM, janis wrote:
>>>> Please try the attached diff (from upstream git) and report back.
>>>>
>>> Thanks, David! Brian Callahan already asked me to test the same patch
>>> and I informed him that it works and solves my problem. Thank you very
>>> much. Please commit it.
>>
>> Excellent.
>>
>> Mathias Gumz (fluxbox' author) told me that since this bug affects us
>> and probably the other BSDs as well, he'll release fluxbox-1.3.7
>> soonish.
>
> As anticipated by Mathias, here's Fluxbox 1.3.7.
>
> Please test and comment.
>
> Ciao!
> David
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/fluxbox/Makefile,v
> retrieving revision 1.78
> diff -u -p -u -p -r1.78 Makefile
> --- Makefile 21 Jan 2015 08:52:04 - 1.78
> +++ Makefile 9 Feb 2015 10:32:52 -
> @@ -1,8 +1,7 @@
> # $OpenBSD: Makefile,v 1.78 2015/01/21 08:52:04 dcoppa Exp $
>
> COMMENT =window manager based on the original Blackbox code
> -DISTNAME = fluxbox-1.3.6
> -REVISION = 0
> +DISTNAME = fluxbox-1.3.7
> CATEGORIES = x11
>
> HOMEPAGE = http://fluxbox.org/
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/fluxbox/distinfo,v
> retrieving revision 1.28
> diff -u -p -u -p -r1.28 distinfo
> --- distinfo 11 Jan 2015 15:59:19 - 1.28
> +++ distinfo 9 Feb 2015 10:32:52 -
> @@ -1,2 +1,2 @@
> -SHA256 (fluxbox-1.3.6.tar.gz) = y1TrYtPbovKCpQ+90HfSaiyfVVwStb9mSxGS7OdmlSc=
> -SIZE (fluxbox-1.3.6.tar.gz) = 1312141
> +SHA256 (fluxbox-1.3.7.tar.gz) = yZ4rqgb/8eljQrIEFQWdEv8fopF63gFzx1svpXApW58=
> +SIZE (fluxbox-1.3.7.tar.gz) = 1267833
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/x11/fluxbox/patches/patch-Makefile_in,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 patch-Makefile_in
> --- patches/patch-Makefile_in 11 Jan 2015 15:59:19 - 1.3
> +++ patches/patch-Makefile_in 9 Feb 2015 10:32:52 -
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Makefile_in,v 1.3 2015/01/11 15:59:19 bcallah Exp $
> Makefile.in.orig Wed Jan 7 13:16:02 2015
> -+++ Makefile.in Wed Jan 7 13:16:25 2015
> -@@ -5234,7 +5234,6 @@ src/defaults.hh:
> +--- Makefile.in.orig Sun Feb 8 04:44:52 2015
> Makefile.in Mon Feb 9 04:26:49 2015
> +@@ -5275,7 +5275,6 @@ src/defaults.hh:
>
> src/defaults.cc: force
> @( \
> @@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2015/0
> echo '// This file is generated from Makefile. Do not edit!'; \
> echo '#include "defaults.hh"'; \
> echo ''; \
> -@@ -5243,11 +5242,7 @@ src/defaults.cc: force
> +@@ -5284,11 +5283,7 @@ src/defaults.cc: force
> echo '}'; \
> echo ''; \
> echo 'const char* gitrevision() {'; \
> Index: patches/patch-src_FbTk_TextButton_cc
> ===
> RCS file: patches/patch-src_FbTk_TextButton_cc
> diff -N patches/patch-src_FbTk_TextButton_cc
> --- patches/patch-src_FbTk_TextButton_cc 21 Jan 2015 08:52:04 -
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,39 +0,0 @@
> -$OpenBSD: patch-src_FbTk_TextButton_cc,v 1.1 2015/01/21 08:52:04 dcoppa Exp $
> -
> -commit 7b8fd2d81ad80a73564fc9fbb779f47568f12652
> -Author: Mathias Gumz
> -Date: Sat Jan 10 22:44:37 2015 +0100
> -
> -Fix bug: integer underflow in startup phase
> -
> -When fluxbox comes up some of it's drawables span a 1x1 area. Subtracting
> from
> -such small numbers bigger ones always lead to massive problems when 'unsigned
> -int' are involved:
> -
> -'button_width' is an unsigned int of '1' (this might be caused by another
> -issue or on purpose, anyway), subtracting -10 or any other number should
> -result in something < 0 when in reality an integer underflow happen:
> max_width
> -is now MAX_INT-something big. This makes fluxbox crash under certain
> -circumstances.
> -
> src/FbTk/TextButton.cc.orig Mon Jun 17 06:38:14 2013
> -+++ src/FbTk/TextButton.cc Wed Jan 21 01:54:20 2015
> -@@ -143,11 +143,17 @@ void TextButton::drawText(int x_offset, int y_offset,
> -
fluxbox-1.3.7 (Was: UPDATE: x11/fluxbox 1.3.5 => 1.3.6)
> From: David Coppa
> Date: Wed, Jan 21, 2015 at 9:22 AM
> Subject: Re: UPDATE: x11/fluxbox 1.3.5 => 1.3.6
> To: janis
> Cc: OpenBSD Ports , Brian Callahan
>
>
> On Wed, Jan 21, 2015 at 9:13 AM, janis wrote:
> >> Please try the attached diff (from upstream git) and report back.
> >>
> > Thanks, David! Brian Callahan already asked me to test the same patch
> > and I informed him that it works and solves my problem. Thank you very
> > much. Please commit it.
>
> Excellent.
>
> Mathias Gumz (fluxbox' author) told me that since this bug affects us
> and probably the other BSDs as well, he'll release fluxbox-1.3.7
> soonish.
As anticipated by Mathias, here's Fluxbox 1.3.7.
Please test and comment.
Ciao!
David
Index: Makefile
===
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.78
diff -u -p -u -p -r1.78 Makefile
--- Makefile21 Jan 2015 08:52:04 - 1.78
+++ Makefile9 Feb 2015 10:32:52 -
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.78 2015/01/21 08:52:04 dcoppa Exp $
COMMENT = window manager based on the original Blackbox code
-DISTNAME = fluxbox-1.3.6
-REVISION = 0
+DISTNAME = fluxbox-1.3.7
CATEGORIES = x11
HOMEPAGE = http://fluxbox.org/
Index: distinfo
===
RCS file: /cvs/ports/x11/fluxbox/distinfo,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 distinfo
--- distinfo11 Jan 2015 15:59:19 - 1.28
+++ distinfo9 Feb 2015 10:32:52 -
@@ -1,2 +1,2 @@
-SHA256 (fluxbox-1.3.6.tar.gz) = y1TrYtPbovKCpQ+90HfSaiyfVVwStb9mSxGS7OdmlSc=
-SIZE (fluxbox-1.3.6.tar.gz) = 1312141
+SHA256 (fluxbox-1.3.7.tar.gz) = yZ4rqgb/8eljQrIEFQWdEv8fopF63gFzx1svpXApW58=
+SIZE (fluxbox-1.3.7.tar.gz) = 1267833
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/x11/fluxbox/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 11 Jan 2015 15:59:19 - 1.3
+++ patches/patch-Makefile_in 9 Feb 2015 10:32:52 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.3 2015/01/11 15:59:19 bcallah Exp $
Makefile.in.orig Wed Jan 7 13:16:02 2015
-+++ Makefile.inWed Jan 7 13:16:25 2015
-@@ -5234,7 +5234,6 @@ src/defaults.hh:
+--- Makefile.in.orig Sun Feb 8 04:44:52 2015
Makefile.inMon Feb 9 04:26:49 2015
+@@ -5275,7 +5275,6 @@ src/defaults.hh:
src/defaults.cc: force
@( \
@@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2015/0
echo '// This file is generated from Makefile. Do not edit!'; \
echo '#include "defaults.hh"'; \
echo ''; \
-@@ -5243,11 +5242,7 @@ src/defaults.cc: force
+@@ -5284,11 +5283,7 @@ src/defaults.cc: force
echo '}'; \
echo ''; \
echo 'const char* gitrevision() {'; \
Index: patches/patch-src_FbTk_TextButton_cc
===
RCS file: patches/patch-src_FbTk_TextButton_cc
diff -N patches/patch-src_FbTk_TextButton_cc
--- patches/patch-src_FbTk_TextButton_cc21 Jan 2015 08:52:04 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,39 +0,0 @@
-$OpenBSD: patch-src_FbTk_TextButton_cc,v 1.1 2015/01/21 08:52:04 dcoppa Exp $
-
-commit 7b8fd2d81ad80a73564fc9fbb779f47568f12652
-Author: Mathias Gumz
-Date: Sat Jan 10 22:44:37 2015 +0100
-
-Fix bug: integer underflow in startup phase
-
-When fluxbox comes up some of it's drawables span a 1x1 area. Subtracting from
-such small numbers bigger ones always lead to massive problems when 'unsigned
-int' are involved:
-
-'button_width' is an unsigned int of '1' (this might be caused by another
-issue or on purpose, anyway), subtracting -10 or any other number should
-result in something < 0 when in reality an integer underflow happen: max_width
-is now MAX_INT-something big. This makes fluxbox crash under certain
-circumstances.
-
src/FbTk/TextButton.cc.origMon Jun 17 06:38:14 2013
-+++ src/FbTk/TextButton.cc Wed Jan 21 01:54:20 2015
-@@ -143,11 +143,17 @@ void TextButton::drawText(int x_offset, int y_offset,
- 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_
Re: UPDATE: x11/fluxbox 1.3.5 => 1.3.6
On Wed, Jan 21, 2015 at 9:13 AM, janis wrote: >> Please try the attached diff (from upstream git) and report back. >> > Thanks, David! Brian Callahan already asked me to test the same patch > and I informed him that it works and solves my problem. Thank you very > much. Please commit it. Excellent. Mathias Gumz (fluxbox' author) told me that since this bug affects us and probably the other BSDs as well, he'll release fluxbox-1.3.7 soonish. > -- > Ar cieņu, > Jānis Lukaševičs cheers! David
Re: UPDATE: x11/fluxbox 1.3.5 => 1.3.6
> Please try the attached diff (from upstream git) and report back. > Thanks, David! Brian Callahan already asked me to test the same patch and I informed him that it works and solves my problem. Thank you very much. Please commit it. -- Ar cieņu, Jānis Lukaševičs Latvijas Zvērinātu notāru padomes datorsistēmu administrators Mob. tālr.: +371 26306294 Tālr: +371 67218955 http://www.latvijasnotars.lv
Re: UPDATE: x11/fluxbox 1.3.5 => 1.3.6
On Tue, Jan 20, 2015 at 10:11 AM, janis wrote: > On 01/20/15 10:53, David Coppa wrote: >> On Tue, Jan 20, 2015 at 9:40 AM, janis wrote: >>> Here is a more informational backtrace from fluxbox compiled with >>> >>> # DEBUG="-ggdb -O0" INSTALL_STRIP= make clean repackage reinstall >>> >>> $ gdb /usr/local/bin/fluxbox fluxbox.core >> >> ... >> >>> #8 0x0cae1b1a0f29 in FbTk::XmbFontImp::textWidth >>> (this=0xcb0999f0aa0, text=0xcb0546eecd8 "xterm", len=471974426) at >>> src/FbTk/XmbFontImp.cc:219 >>> #9 0x0cae1b157e16 in FbTk::Font::textWidth (this=0xcb02986bf10, >>> text=0xcb0546eecd8 "xterm", size=471974426) at src/FbTk/Font.cc:261 >>> #10 0x0cae1b18e689 in maxTextLength (max_width=-10, >>> font=@0xcb02986bf10, text=0xcb0546eecd8 "xterm", >>> text_len=@0x7f7d45bc, text_width=@0x7f7d45e4) at >>> src/FbTk/TextUtils.cc:57 >>> #11 0x0cae1b18e731 in FbTk::doAlignment (max_width=-9, bevel=1, >>> justify=FbTk::CENTER, font=@0xcb02986bf10, text=0xcb0546eecd8 "xterm", >>> textlen=5, newlen=@0x7f7d466c) at src/FbTk/TextUtils.cc:83 >>> #12 0x0cae1b18d670 in FbTk::TextButton::drawText >>> (this=0xcb113e6cc00, x_offset=10, y_offset=0, drawable=0x7f7d4780) >>> at src/FbTk/TextButton.cc:153 >>> #13 0x0cae1b0781dd in IconButton::drawText (this=0xcb113e6cc00, x=0, >>> y=0, drawable=0x7f7d4780) at src/IconButton.cc:259 >>> #14 0x0cae1b18d33a in FbTk::TextButton::renderForeground >>> (this=0xcb113e6cc00, win=@0xcb113e6cc00, drawable=@0x7f7d4780) at >>> src/FbTk/TextButton.cc:134 >>> #15 0x0cae1b154a54 in FbTk::FbWindow::updateBackground >>> (this=0xcb113e6cc00, only_if_alpha=false) at src/FbTk/FbWindow.cc:234 >>> #16 0x0cae1b035116 in FbTk::FbWindow::moveResize >>> (this=0xcb113e6cc00, x=-1, y=-1, width=1, height=1) at FbWindow.hh:144 >>> #17 0x0cae1b18da4b in FbTk::TextButton::moveResize >>> (this=0xcb113e6cc00, x=-1, y=-1, width=1, height=1) at >>> src/FbTk/TextButton.cc:58 >>> #18 0x0cae1b078cc6 in IconButton::moveResize (this=0xcb113e6cc00, >>> x=-1, y=-1, width=1, height=1) at src/IconButton.cc:96 >>> #19 0x0cae1b14a5e4 in FbTk::Container::repositionItems >>> (this=0xcb0546ec960) at src/FbTk/Container.cc:403 >>> #20 0x0cae1b14b027 in FbTk::Container::insertItem >>> (this=0xcb0546ec960, item=0xcb113e6cc00, pos=-1) at src/FbTk/Container.cc:92 >>> #21 0x0cae1b05defd in FbWinFrame::createTab (this=0xcb0546ec830, >>> button=@0xcb113e6cc00) at src/FbWinFrame.cc:629 >>> #22 0x0cae1b0c7c9a in FluxboxWindow::associateClient >>> (this=0xcb0546ec1d0, client=@0xcb08a07d000) at src/Window.cc:3679 >>> #23 0x0cae1b0d60d2 in FluxboxWindow::init (this=0xcb0546ec1d0) at >>> src/Window.cc:415 >>> #24 0x0cae1b0d7252 in FluxboxWindow (this=0xcb0546ec1d0, >>> client=@0xcb08a07d000) at src/Window.cc:307 >>> #25 0x0cae1b099e96 in BScreen::createWindow (this=0xcb0f7bfa520, >>> client=20971533) at src/Screen.cc:1270 >>> #26 0x0cae1b0ec00b in Fluxbox::handleEvent (this=0xcb0cc1d5000, >>> e=0x7f7d4f20) at src/fluxbox.cc:679 >>> #27 0x0cae1b0ec987 in Fluxbox::eventLoop (this=0xcb0cc1d5000) at >>> src/fluxbox.cc:545 >>> #28 0x0cae1b0fac00 in main (argc=1, argv=0x7f7d5518) at >>> src/main.cc:221 >>> Current language: auto; currently asm >>> >> >> This[1] commit probably introduced a regression. >> >> [1] >> http://git.fluxbox.org/fluxbox.git/commit/src/FbTk/TextUtils.cc?id=118ea25f9d581de6fc2c57dde7b8737cbba6faf4 >> > Thanks for your help! What can be done about it? Please try the attached diff (from upstream git) and report back. Ciao, David fluxbox-crash-fix.diff.gz Description: GNU Zip compressed data
Re: UPDATE: x11/fluxbox 1.3.5 => 1.3.6
On Tue, Jan 20, 2015 at 10:11 AM, janis wrote: > On 01/20/15 10:53, David Coppa wrote: >> On Tue, Jan 20, 2015 at 9:40 AM, janis wrote: >>> Here is a more informational backtrace from fluxbox compiled with >>> >>> # DEBUG="-ggdb -O0" INSTALL_STRIP= make clean repackage reinstall >>> >>> $ gdb /usr/local/bin/fluxbox fluxbox.core >> >> ... >> >>> #8 0x0cae1b1a0f29 in FbTk::XmbFontImp::textWidth >>> (this=0xcb0999f0aa0, text=0xcb0546eecd8 "xterm", len=471974426) at >>> src/FbTk/XmbFontImp.cc:219 >>> #9 0x0cae1b157e16 in FbTk::Font::textWidth (this=0xcb02986bf10, >>> text=0xcb0546eecd8 "xterm", size=471974426) at src/FbTk/Font.cc:261 >>> #10 0x0cae1b18e689 in maxTextLength (max_width=-10, >>> font=@0xcb02986bf10, text=0xcb0546eecd8 "xterm", >>> text_len=@0x7f7d45bc, text_width=@0x7f7d45e4) at >>> src/FbTk/TextUtils.cc:57 >>> #11 0x0cae1b18e731 in FbTk::doAlignment (max_width=-9, bevel=1, >>> justify=FbTk::CENTER, font=@0xcb02986bf10, text=0xcb0546eecd8 "xterm", >>> textlen=5, newlen=@0x7f7d466c) at src/FbTk/TextUtils.cc:83 >>> #12 0x0cae1b18d670 in FbTk::TextButton::drawText >>> (this=0xcb113e6cc00, x_offset=10, y_offset=0, drawable=0x7f7d4780) >>> at src/FbTk/TextButton.cc:153 >>> #13 0x0cae1b0781dd in IconButton::drawText (this=0xcb113e6cc00, x=0, >>> y=0, drawable=0x7f7d4780) at src/IconButton.cc:259 >>> #14 0x0cae1b18d33a in FbTk::TextButton::renderForeground >>> (this=0xcb113e6cc00, win=@0xcb113e6cc00, drawable=@0x7f7d4780) at >>> src/FbTk/TextButton.cc:134 >>> #15 0x0cae1b154a54 in FbTk::FbWindow::updateBackground >>> (this=0xcb113e6cc00, only_if_alpha=false) at src/FbTk/FbWindow.cc:234 >>> #16 0x0cae1b035116 in FbTk::FbWindow::moveResize >>> (this=0xcb113e6cc00, x=-1, y=-1, width=1, height=1) at FbWindow.hh:144 >>> #17 0x0cae1b18da4b in FbTk::TextButton::moveResize >>> (this=0xcb113e6cc00, x=-1, y=-1, width=1, height=1) at >>> src/FbTk/TextButton.cc:58 >>> #18 0x0cae1b078cc6 in IconButton::moveResize (this=0xcb113e6cc00, >>> x=-1, y=-1, width=1, height=1) at src/IconButton.cc:96 >>> #19 0x0cae1b14a5e4 in FbTk::Container::repositionItems >>> (this=0xcb0546ec960) at src/FbTk/Container.cc:403 >>> #20 0x0cae1b14b027 in FbTk::Container::insertItem >>> (this=0xcb0546ec960, item=0xcb113e6cc00, pos=-1) at src/FbTk/Container.cc:92 >>> #21 0x0cae1b05defd in FbWinFrame::createTab (this=0xcb0546ec830, >>> button=@0xcb113e6cc00) at src/FbWinFrame.cc:629 >>> #22 0x0cae1b0c7c9a in FluxboxWindow::associateClient >>> (this=0xcb0546ec1d0, client=@0xcb08a07d000) at src/Window.cc:3679 >>> #23 0x0cae1b0d60d2 in FluxboxWindow::init (this=0xcb0546ec1d0) at >>> src/Window.cc:415 >>> #24 0x0cae1b0d7252 in FluxboxWindow (this=0xcb0546ec1d0, >>> client=@0xcb08a07d000) at src/Window.cc:307 >>> #25 0x0cae1b099e96 in BScreen::createWindow (this=0xcb0f7bfa520, >>> client=20971533) at src/Screen.cc:1270 >>> #26 0x0cae1b0ec00b in Fluxbox::handleEvent (this=0xcb0cc1d5000, >>> e=0x7f7d4f20) at src/fluxbox.cc:679 >>> #27 0x0cae1b0ec987 in Fluxbox::eventLoop (this=0xcb0cc1d5000) at >>> src/fluxbox.cc:545 >>> #28 0x0cae1b0fac00 in main (argc=1, argv=0x7f7d5518) at >>> src/main.cc:221 >>> Current language: auto; currently asm >>> >> >> This[1] commit probably introduced a regression. >> >> [1] >> http://git.fluxbox.org/fluxbox.git/commit/src/FbTk/TextUtils.cc?id=118ea25f9d581de6fc2c57dde7b8737cbba6faf4 >> > Thanks for your help! What can be done about it? > Open a detailed ticket at http://sourceforge.net/p/fluxbox/bugs/
Re: UPDATE: x11/fluxbox 1.3.5 => 1.3.6
On 01/20/15 10:53, David Coppa wrote: > On Tue, Jan 20, 2015 at 9:40 AM, janis wrote: >> Here is a more informational backtrace from fluxbox compiled with >> >> # DEBUG="-ggdb -O0" INSTALL_STRIP= make clean repackage reinstall >> >> $ gdb /usr/local/bin/fluxbox fluxbox.core > > ... > >> #8 0x0cae1b1a0f29 in FbTk::XmbFontImp::textWidth >> (this=0xcb0999f0aa0, text=0xcb0546eecd8 "xterm", len=471974426) at >> src/FbTk/XmbFontImp.cc:219 >> #9 0x0cae1b157e16 in FbTk::Font::textWidth (this=0xcb02986bf10, >> text=0xcb0546eecd8 "xterm", size=471974426) at src/FbTk/Font.cc:261 >> #10 0x0cae1b18e689 in maxTextLength (max_width=-10, >> font=@0xcb02986bf10, text=0xcb0546eecd8 "xterm", >> text_len=@0x7f7d45bc, text_width=@0x7f7d45e4) at >> src/FbTk/TextUtils.cc:57 >> #11 0x0cae1b18e731 in FbTk::doAlignment (max_width=-9, bevel=1, >> justify=FbTk::CENTER, font=@0xcb02986bf10, text=0xcb0546eecd8 "xterm", >> textlen=5, newlen=@0x7f7d466c) at src/FbTk/TextUtils.cc:83 >> #12 0x0cae1b18d670 in FbTk::TextButton::drawText >> (this=0xcb113e6cc00, x_offset=10, y_offset=0, drawable=0x7f7d4780) >> at src/FbTk/TextButton.cc:153 >> #13 0x0cae1b0781dd in IconButton::drawText (this=0xcb113e6cc00, x=0, >> y=0, drawable=0x7f7d4780) at src/IconButton.cc:259 >> #14 0x0cae1b18d33a in FbTk::TextButton::renderForeground >> (this=0xcb113e6cc00, win=@0xcb113e6cc00, drawable=@0x7f7d4780) at >> src/FbTk/TextButton.cc:134 >> #15 0x0cae1b154a54 in FbTk::FbWindow::updateBackground >> (this=0xcb113e6cc00, only_if_alpha=false) at src/FbTk/FbWindow.cc:234 >> #16 0x0cae1b035116 in FbTk::FbWindow::moveResize >> (this=0xcb113e6cc00, x=-1, y=-1, width=1, height=1) at FbWindow.hh:144 >> #17 0x0cae1b18da4b in FbTk::TextButton::moveResize >> (this=0xcb113e6cc00, x=-1, y=-1, width=1, height=1) at >> src/FbTk/TextButton.cc:58 >> #18 0x0cae1b078cc6 in IconButton::moveResize (this=0xcb113e6cc00, >> x=-1, y=-1, width=1, height=1) at src/IconButton.cc:96 >> #19 0x0cae1b14a5e4 in FbTk::Container::repositionItems >> (this=0xcb0546ec960) at src/FbTk/Container.cc:403 >> #20 0x0cae1b14b027 in FbTk::Container::insertItem >> (this=0xcb0546ec960, item=0xcb113e6cc00, pos=-1) at src/FbTk/Container.cc:92 >> #21 0x0cae1b05defd in FbWinFrame::createTab (this=0xcb0546ec830, >> button=@0xcb113e6cc00) at src/FbWinFrame.cc:629 >> #22 0x0cae1b0c7c9a in FluxboxWindow::associateClient >> (this=0xcb0546ec1d0, client=@0xcb08a07d000) at src/Window.cc:3679 >> #23 0x0cae1b0d60d2 in FluxboxWindow::init (this=0xcb0546ec1d0) at >> src/Window.cc:415 >> #24 0x0cae1b0d7252 in FluxboxWindow (this=0xcb0546ec1d0, >> client=@0xcb08a07d000) at src/Window.cc:307 >> #25 0x0cae1b099e96 in BScreen::createWindow (this=0xcb0f7bfa520, >> client=20971533) at src/Screen.cc:1270 >> #26 0x0cae1b0ec00b in Fluxbox::handleEvent (this=0xcb0cc1d5000, >> e=0x7f7d4f20) at src/fluxbox.cc:679 >> #27 0x0cae1b0ec987 in Fluxbox::eventLoop (this=0xcb0cc1d5000) at >> src/fluxbox.cc:545 >> #28 0x0cae1b0fac00 in main (argc=1, argv=0x7f7d5518) at >> src/main.cc:221 >> Current language: auto; currently asm >> > > This[1] commit probably introduced a regression. > > [1] > http://git.fluxbox.org/fluxbox.git/commit/src/FbTk/TextUtils.cc?id=118ea25f9d581de6fc2c57dde7b8737cbba6faf4 > Thanks for your help! What can be done about it?
Re: UPDATE: x11/fluxbox 1.3.5 => 1.3.6
On Tue, Jan 20, 2015 at 9:40 AM, janis wrote: > Here is a more informational backtrace from fluxbox compiled with > > # DEBUG="-ggdb -O0" INSTALL_STRIP= make clean repackage reinstall > > $ gdb /usr/local/bin/fluxbox fluxbox.core ... > #8 0x0cae1b1a0f29 in FbTk::XmbFontImp::textWidth > (this=0xcb0999f0aa0, text=0xcb0546eecd8 "xterm", len=471974426) at > src/FbTk/XmbFontImp.cc:219 > #9 0x0cae1b157e16 in FbTk::Font::textWidth (this=0xcb02986bf10, > text=0xcb0546eecd8 "xterm", size=471974426) at src/FbTk/Font.cc:261 > #10 0x0cae1b18e689 in maxTextLength (max_width=-10, > font=@0xcb02986bf10, text=0xcb0546eecd8 "xterm", > text_len=@0x7f7d45bc, text_width=@0x7f7d45e4) at > src/FbTk/TextUtils.cc:57 > #11 0x0cae1b18e731 in FbTk::doAlignment (max_width=-9, bevel=1, > justify=FbTk::CENTER, font=@0xcb02986bf10, text=0xcb0546eecd8 "xterm", > textlen=5, newlen=@0x7f7d466c) at src/FbTk/TextUtils.cc:83 > #12 0x0cae1b18d670 in FbTk::TextButton::drawText > (this=0xcb113e6cc00, x_offset=10, y_offset=0, drawable=0x7f7d4780) > at src/FbTk/TextButton.cc:153 > #13 0x0cae1b0781dd in IconButton::drawText (this=0xcb113e6cc00, x=0, > y=0, drawable=0x7f7d4780) at src/IconButton.cc:259 > #14 0x0cae1b18d33a in FbTk::TextButton::renderForeground > (this=0xcb113e6cc00, win=@0xcb113e6cc00, drawable=@0x7f7d4780) at > src/FbTk/TextButton.cc:134 > #15 0x0cae1b154a54 in FbTk::FbWindow::updateBackground > (this=0xcb113e6cc00, only_if_alpha=false) at src/FbTk/FbWindow.cc:234 > #16 0x0cae1b035116 in FbTk::FbWindow::moveResize > (this=0xcb113e6cc00, x=-1, y=-1, width=1, height=1) at FbWindow.hh:144 > #17 0x0cae1b18da4b in FbTk::TextButton::moveResize > (this=0xcb113e6cc00, x=-1, y=-1, width=1, height=1) at > src/FbTk/TextButton.cc:58 > #18 0x0cae1b078cc6 in IconButton::moveResize (this=0xcb113e6cc00, > x=-1, y=-1, width=1, height=1) at src/IconButton.cc:96 > #19 0x0cae1b14a5e4 in FbTk::Container::repositionItems > (this=0xcb0546ec960) at src/FbTk/Container.cc:403 > #20 0x0cae1b14b027 in FbTk::Container::insertItem > (this=0xcb0546ec960, item=0xcb113e6cc00, pos=-1) at src/FbTk/Container.cc:92 > #21 0x0cae1b05defd in FbWinFrame::createTab (this=0xcb0546ec830, > button=@0xcb113e6cc00) at src/FbWinFrame.cc:629 > #22 0x0cae1b0c7c9a in FluxboxWindow::associateClient > (this=0xcb0546ec1d0, client=@0xcb08a07d000) at src/Window.cc:3679 > #23 0x0cae1b0d60d2 in FluxboxWindow::init (this=0xcb0546ec1d0) at > src/Window.cc:415 > #24 0x0cae1b0d7252 in FluxboxWindow (this=0xcb0546ec1d0, > client=@0xcb08a07d000) at src/Window.cc:307 > #25 0x0cae1b099e96 in BScreen::createWindow (this=0xcb0f7bfa520, > client=20971533) at src/Screen.cc:1270 > #26 0x0cae1b0ec00b in Fluxbox::handleEvent (this=0xcb0cc1d5000, > e=0x7f7d4f20) at src/fluxbox.cc:679 > #27 0x0cae1b0ec987 in Fluxbox::eventLoop (this=0xcb0cc1d5000) at > src/fluxbox.cc:545 > #28 0x0cae1b0fac00 in main (argc=1, argv=0x7f7d5518) at > src/main.cc:221 > Current language: auto; currently asm > This[1] commit probably introduced a regression. [1] http://git.fluxbox.org/fluxbox.git/commit/src/FbTk/TextUtils.cc?id=118ea25f9d581de6fc2c57dde7b8737cbba6faf4 Ciao! David -- "If you try a few times and give up, you'll never get there. But if you keep at it... There's a lot of problems in the world which can really be solved by applying two or three times the persistence that other people will." -- Stewart Nelson
Re: UPDATE: x11/fluxbox 1.3.5 => 1.3.6
Here is a more informational backtrace from fluxbox compiled with # DEBUG="-ggdb -O0" INSTALL_STRIP= make clean repackage reinstall $ gdb /usr/local/bin/fluxbox fluxbox.core GNU gdb 6.3 Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type "show copying" to see the conditions. There is absolutely no warranty for GDB. Type "show warranty" for details. This GDB was configured as "amd64-unknown-openbsd5.7"... Core was generated by `fluxbox'. Program terminated with signal 6, Aborted. Loaded symbols for /usr/local/bin/fluxbox Reading symbols from /usr/X11R6/lib/libfontconfig.so.9.1...done. Loaded symbols for /usr/X11R6/lib/libfontconfig.so.9.1 Reading symbols from /usr/X11R6/lib/libfreetype.so.23.0...done. Loaded symbols for /usr/X11R6/lib/libfreetype.so.23.0 Reading symbols from /usr/lib/libz.so.5.0...done. Loaded symbols for /usr/lib/libz.so.5.0 Reading symbols from /usr/local/lib/libfribidi.so.2.0...done. Loaded symbols for /usr/local/lib/libfribidi.so.2.0 Reading symbols from /usr/local/lib/libImlib2.so.6.0...done. Loaded symbols for /usr/local/lib/libImlib2.so.6.0 Reading symbols from /usr/X11R6/lib/libX11.so.16.0...done. Loaded symbols for /usr/X11R6/lib/libX11.so.16.0 Reading symbols from /usr/X11R6/lib/libXext.so.13.0...done. Loaded symbols for /usr/X11R6/lib/libXext.so.13.0 Reading symbols from /usr/X11R6/lib/libXrandr.so.7.0...done. Loaded symbols for /usr/X11R6/lib/libXrandr.so.7.0 Reading symbols from /usr/X11R6/lib/libXft.so.9.0...done. Loaded symbols for /usr/X11R6/lib/libXft.so.9.0 Reading symbols from /usr/X11R6/lib/libXinerama.so.6.0...done. Loaded symbols for /usr/X11R6/lib/libXinerama.so.6.0 Reading symbols from /usr/X11R6/lib/libXpm.so.9.0...done. Loaded symbols for /usr/X11R6/lib/libXpm.so.9.0 Reading symbols from /usr/X11R6/lib/libXrender.so.6.0...done. Loaded symbols for /usr/X11R6/lib/libXrender.so.6.0 Reading symbols from /usr/local/lib/libiconv.so.6.0...done. Loaded symbols for /usr/local/lib/libiconv.so.6.0 Reading symbols from /usr/lib/libm.so.9.0...done. Loaded symbols for /usr/lib/libm.so.9.0 Reading symbols from /usr/lib/libstdc++.so.57.0...done. Loaded symbols for /usr/lib/libstdc++.so.57.0 Reading symbols from /usr/lib/libc.so.78.1...done. Loaded symbols for /usr/lib/libc.so.78.1 Reading symbols from /usr/lib/libexpat.so.11.0...done. Loaded symbols for /usr/lib/libexpat.so.11.0 Reading symbols from /usr/X11R6/lib/libpthread-stubs.so.2.0...done. Loaded symbols for /usr/X11R6/lib/libpthread-stubs.so.2.0 Reading symbols from /usr/X11R6/lib/libxcb.so.3.1...done. Loaded symbols for /usr/X11R6/lib/libxcb.so.3.1 Reading symbols from /usr/X11R6/lib/libXau.so.10.0...done. Loaded symbols for /usr/X11R6/lib/libXau.so.10.0 Reading symbols from /usr/X11R6/lib/libXdmcp.so.11.0...done. Loaded symbols for /usr/X11R6/lib/libXdmcp.so.11.0 Reading symbols from /usr/libexec/ld.so...done. Loaded symbols for /usr/libexec/ld.so Reading symbols from /usr/X11R6/lib/libXcursor.so.5.0...done. Loaded symbols for /usr/X11R6/lib/libXcursor.so.5.0 Reading symbols from /usr/X11R6/lib/libXfixes.so.6.0...done. Loaded symbols for /usr/X11R6/lib/libXfixes.so.6.0 #0 0x0cb0ac4a79ea in kill () at :2 2 : No such file or directory. in (gdb) bt #0 0x0cb0ac4a79ea in kill () at :2 #1 0x0cb0ac4e11c9 in abort () at /usr/src/lib/libc/stdlib/abort.c:53 #2 0x0cae1b0fb7e6 in handleSignal (signum=11) at src/main.cc:108 #3 #4 0x0cb07ccb1980 in utf8_mbtowc () from /usr/X11R6/lib/libX11.so.16.0 #5 0x0cb07ccb5d1e in utf8tocs () from /usr/X11R6/lib/libX11.so.16.0 #6 0x0cb07ccbe0fb in _XomConvert () from /usr/X11R6/lib/libX11.so.16.0 #7 0x0cb07ccbd5a6 in _XomGenericTextExtents () from /usr/X11R6/lib/libX11.so.16.0 #8 0x0cae1b1a0f29 in FbTk::XmbFontImp::textWidth (this=0xcb0999f0aa0, text=0xcb0546eecd8 "xterm", len=471974426) at src/FbTk/XmbFontImp.cc:219 #9 0x0cae1b157e16 in FbTk::Font::textWidth (this=0xcb02986bf10, text=0xcb0546eecd8 "xterm", size=471974426) at src/FbTk/Font.cc:261 #10 0x0cae1b18e689 in maxTextLength (max_width=-10, font=@0xcb02986bf10, text=0xcb0546eecd8 "xterm", text_len=@0x7f7d45bc, text_width=@0x7f7d45e4) at src/FbTk/TextUtils.cc:57 #11 0x0cae1b18e731 in FbTk::doAlignment (max_width=-9, bevel=1, justify=FbTk::CENTER, font=@0xcb02986bf10, text=0xcb0546eecd8 "xterm", textlen=5, newlen=@0x7f7d466c) at src/FbTk/TextUtils.cc:83 #12 0x0cae1b18d670 in FbTk::TextButton::drawText (this=0xcb113e6cc00, x_offset=10, y_offset=0, drawable=0x7f7d4780) at src/FbTk/TextButton.cc:153 #13 0x0cae1b0781dd in IconButton::drawText (this=0xcb113e6cc00, x=0, y=0, drawable=0x7f7d4780) at src/IconButton.cc:259 #14 0x0cae1b18d33a in FbTk::TextButton::renderForeground (this=0xcb113e6cc00, win=@0xcb113e6cc00, drawable=@0x7f7d4780) at src/FbTk/TextButton.cc:134 #15 0x0cae1b154
Re: UPDATE: x11/fluxbox 1.3.5 => 1.3.6
Hello! Since this update fluxbox on my machine has become completely unusable, it randomly crashes on opening any applications. For example, xterm opens without crashing fluxbox with a 50-50 probability. Please, be so kind and look at this problem, I can't use my computer. :) Here is a backtrace and dmesg: $ gdb /usr/local/bin/fluxbox fluxbox.core GNU gdb 6.3 Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type "show copying" to see the conditions. There is absolutely no warranty for GDB. Type "show warranty" for details. This GDB was configured as "amd64-unknown-openbsd5.7"...(no debugging symbols found) Core was generated by `fluxbox'. Program terminated with signal 6, Aborted. (no debugging symbols found) Loaded symbols for /usr/local/bin/fluxbox Reading symbols from /usr/X11R6/lib/libfontconfig.so.9.1...done. Loaded symbols for /usr/X11R6/lib/libfontconfig.so.9.1 Reading symbols from /usr/X11R6/lib/libfreetype.so.23.0...done. Loaded symbols for /usr/X11R6/lib/libfreetype.so.23.0 Reading symbols from /usr/lib/libz.so.5.0...done. Loaded symbols for /usr/lib/libz.so.5.0 Reading symbols from /usr/local/lib/libfribidi.so.2.0...done. Loaded symbols for /usr/local/lib/libfribidi.so.2.0 Reading symbols from /usr/local/lib/libImlib2.so.6.0...done. Loaded symbols for /usr/local/lib/libImlib2.so.6.0 Reading symbols from /usr/X11R6/lib/libX11.so.16.0...done. Loaded symbols for /usr/X11R6/lib/libX11.so.16.0 Reading symbols from /usr/X11R6/lib/libXext.so.13.0...done. Loaded symbols for /usr/X11R6/lib/libXext.so.13.0 Reading symbols from /usr/X11R6/lib/libXrandr.so.7.0...done. Loaded symbols for /usr/X11R6/lib/libXrandr.so.7.0 Reading symbols from /usr/X11R6/lib/libXft.so.9.0...done. Loaded symbols for /usr/X11R6/lib/libXft.so.9.0 Reading symbols from /usr/X11R6/lib/libXinerama.so.6.0...done. Loaded symbols for /usr/X11R6/lib/libXinerama.so.6.0 Reading symbols from /usr/X11R6/lib/libXpm.so.9.0...done. Loaded symbols for /usr/X11R6/lib/libXpm.so.9.0 Reading symbols from /usr/X11R6/lib/libXrender.so.6.0...done. Loaded symbols for /usr/X11R6/lib/libXrender.so.6.0 Reading symbols from /usr/local/lib/libiconv.so.6.0...done. Loaded symbols for /usr/local/lib/libiconv.so.6.0 Reading symbols from /usr/lib/libm.so.9.0...done. Loaded symbols for /usr/lib/libm.so.9.0 Reading symbols from /usr/lib/libstdc++.so.57.0...done. Loaded symbols for /usr/lib/libstdc++.so.57.0 Reading symbols from /usr/lib/libc.so.78.1...done. Loaded symbols for /usr/lib/libc.so.78.1 Reading symbols from /usr/lib/libexpat.so.11.0...done. Loaded symbols for /usr/lib/libexpat.so.11.0 Reading symbols from /usr/X11R6/lib/libpthread-stubs.so.2.0...done. Loaded symbols for /usr/X11R6/lib/libpthread-stubs.so.2.0 Reading symbols from /usr/X11R6/lib/libxcb.so.3.1...done. Loaded symbols for /usr/X11R6/lib/libxcb.so.3.1 Reading symbols from /usr/X11R6/lib/libXau.so.10.0...done. Loaded symbols for /usr/X11R6/lib/libXau.so.10.0 Reading symbols from /usr/X11R6/lib/libXdmcp.so.11.0...done. Loaded symbols for /usr/X11R6/lib/libXdmcp.so.11.0 Reading symbols from /usr/libexec/ld.so...done. Loaded symbols for /usr/libexec/ld.so Reading symbols from /usr/X11R6/lib/libXcursor.so.5.0...done. Loaded symbols for /usr/X11R6/lib/libXcursor.so.5.0 Reading symbols from /usr/X11R6/lib/libXfixes.so.6.0...done. Loaded symbols for /usr/X11R6/lib/libXfixes.so.6.0 #0 0x1b0b8998b9ea in kill () at :2 2 : No such file or directory. in (gdb) bt #0 0x1b0b8998b9ea in kill () at :2 #1 0x1b0b899c51e9 in abort () at /usr/src/lib/libc/stdlib/abort.c:53 #2 0x1b09155ef53d in BScreen::screenNumber () from /usr/local/bin/fluxbox #3 #4 0x1b0b7d6849d6 in utf8_mbtowc () from /usr/X11R6/lib/libX11.so.16.0 #5 0x1b0b7d688d1e in utf8tocs () from /usr/X11R6/lib/libX11.so.16.0 #6 0x1b0b7d6910fb in _XomConvert () from /usr/X11R6/lib/libX11.so.16.0 #7 0x1b0b7d6905a6 in _XomGenericTextExtents () from /usr/X11R6/lib/libX11.so.16.0 #8 0x1b0915684cff in toupper () from /usr/local/bin/fluxbox #9 0x1b091567665f in toupper () from /usr/local/bin/fluxbox #10 0x1b0915674c9d in toupper () from /usr/local/bin/fluxbox #11 0x1b0915645396 in BScreen::screenNumber () from /usr/local/bin/fluxbox #12 0x1b09155700dd in IconButton::reconfigTheme () from /usr/local/bin/fluxbox #13 0x1b091563f7a8 in BScreen::screenNumber () from /usr/local/bin/fluxbox #14 0x1b09156401c9 in BScreen::screenNumber () from /usr/local/bin/fluxbox #15 0x1b09155be944 in FluxboxWindow::lower () from /usr/local/bin/fluxbox #16 0x1b09155c7851 in FluxboxWindow::reconfigure () from /usr/local/bin/fluxbox #17 0x1b09155cb489 in FluxboxWindow::reconfigure () from /usr/local/bin/fluxbox #18 0x1b0915590244 in BScreen::shutdown () from /usr/local/bin/fluxbox #19 0x1b09155df65d in FbTk::CommandCreator () f
Re: UPDATE: x11/fluxbox 1.3.5 => 1.3.6
On Sun, Jan 11, 2015 at 4:29 AM, Brian Callahan wrote: > > On 01/07/15 14:54, Brian Callahan wrote: >> Hi ports -- >> >> A new fluxbox was released today, attached is a diff to update it. >> Also do some Makefile rearrangement while here. >> >> Running it here on my machines. All is good. >> Testing on smaller archs appreciated. >> >> OK? >> >> ~Brian >> > > Ping. I have some positive user test reports. Will commit in a few days > if I don't hear otherwise. looks ok to me. ciao! David -- "If you try a few times and give up, you'll never get there. But if you keep at it... There's a lot of problems in the world which can really be solved by applying two or three times the persistence that other people will." -- Stewart Nelson
Re: UPDATE: x11/fluxbox 1.3.5 => 1.3.6
On 01/07/15 14:54, Brian Callahan wrote: > Hi ports -- > > A new fluxbox was released today, attached is a diff to update it. > Also do some Makefile rearrangement while here. > > Running it here on my machines. All is good. > Testing on smaller archs appreciated. > > OK? > > ~Brian > Ping. I have some positive user test reports. Will commit in a few days if I don't hear otherwise.
UPDATE: x11/fluxbox 1.3.5 => 1.3.6
Hi ports --
A new fluxbox was released today, attached is a diff to update it.
Also do some Makefile rearrangement while here.
Running it here on my machines. All is good.
Testing on smaller archs appreciated.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- Makefile 24 May 2014 14:55:16 - 1.76
+++ Makefile 7 Jan 2015 18:33:00 -
@@ -1,37 +1,32 @@
# $OpenBSD: Makefile,v 1.76 2014/05/24 14:55:16 bcallah Exp $
-COMMENT= window manager based on the original Blackbox code
+COMMENT = window manager based on the original Blackbox code
+DISTNAME = fluxbox-1.3.6
+CATEGORIES = x11
-DISTNAME= fluxbox-1.3.5
-REVISION= 1
+HOMEPAGE = http://fluxbox.org/
+MAINTAINER = Brian Callahan
-CATEGORIES= x11
-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
+# X11
+PERMIT_PACKAGE_CDROM = Yes
-HOMEPAGE= http://fluxbox.org/
+WANTLIB += Imlib2 X11 Xext Xft Xinerama Xpm Xrandr Xrender c fontconfig
+WANTLIB += freetype fribidi m stdc++ z
-MAINTAINER= Brian Callahan
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
-# X11
-PERMIT_PACKAGE_CDROM= Yes
+MODULES = converters/libiconv
-MODULES= converters/libiconv
+LIB_DEPENDS= devel/fribidi \
+ graphics/imlib2
-WANTLIB= ICE Imlib2 SM X11 Xext Xft Xinerama \
- Xpm Xrandr Xrender c fontconfig \
- freetype fribidi m stdc++ z
-
-CONFIGURE_STYLE= gnu
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_STYLE = gnu
+CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-USE_GMAKE= Yes
-USE_GROFF = Yes
-
-NO_TEST= Yes
+USE_GMAKE = Yes
+USE_GROFF = Yes
-LIB_DEPENDS= devel/fribidi>=0.19.2 \
- graphics/imlib2
+NO_TEST = Yes
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/fluxbox/distinfo,v
retrieving revision 1.27
diff -u -p -r1.27 distinfo
--- distinfo 16 Apr 2013 15:27:03 - 1.27
+++ distinfo 7 Jan 2015 18:33:00 -
@@ -1,2 +1,2 @@
-SHA256 (fluxbox-1.3.5.tar.gz) = mdaID4VS/SqP9M38eqev9Y8K4EqWLMrEEt0mzYhFW5c=
-SIZE (fluxbox-1.3.5.tar.gz) = 1125565
+SHA256 (fluxbox-1.3.6.tar.gz) = y1TrYtPbovKCpQ+90HfSaiyfVVwStb9mSxGS7OdmlSc=
+SIZE (fluxbox-1.3.6.tar.gz) = 1312141
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in 7 Jan 2015 18:33:00 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- Makefile.in.orig Wed Jan 7 13:16:02 2015
Makefile.in Wed Jan 7 13:16:25 2015
+@@ -5234,7 +5234,6 @@ src/defaults.hh:
+
+ src/defaults.cc: force
+ @( \
+- GITDIR=$(top_srcdir)/.git; \
+ echo '// This file is generated from Makefile. Do not edit!'; \
+ echo '#include "defaults.hh"'; \
+ echo ''; \
+@@ -5243,11 +5242,7 @@ src/defaults.cc: force
+ echo '}'; \
+ echo ''; \
+ echo 'const char* gitrevision() {'; \
+- if test -r $$GITDIR/HEAD; then \
+- echo ' return "'`cd $$GITDIR && git rev-parse HEAD`'";'; \
+- else \
+- echo ' return "unknown";'; \
+- fi; \
++ echo ' return "unknown";'; \
+ echo '}' ) > $(top_builddir)/src/defaults_tmp.cc
+ @if ! cmp $(top_builddir)/src/defaults_tmp.cc $(top_builddir)/src/defaults.cc ; then cp $(top_builddir)/src/defaults_tmp.cc $(top_builddir)/src/defaults.cc; fi
+ @rm $(top_builddir)/src/defaults_tmp.cc
Index: patches/patch-src_Makefile_in
===
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in 16 Apr 2013 15:27:03 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.4 2013/04/16 15:27:03 bcallah Exp $
-
-Don't check for git revision, this is a stable release
-
src/Makefile.in.orig Sun Apr 7 18:10:55 2013
-+++ src/Makefile.in Sun Apr 7 18:12:55 2013
-@@ -933,7 +933,6 @@ defaults.hh: Makefile
-
- defaults.cc: force
- @( \
-- GITDIR=$(top_srcdir)/.git; \
- echo '// This file is generated from Makefile. Do not edit!'; \
- echo '#include "defaults.hh"'; \
- echo ''; \
-@@ -942,11 +941,7 @@ defaults.cc: force
- echo '}'; \
- echo ''; \
- echo 'const char* gitrevision() {'; \
-- if test -r $$GITDIR/HEAD; then \
-- echo ' return "'`cat $$GITDIR/$$(cat $$GITDIR/HEAD | cut -f 2 -d ' ')`'";'; \
-- else \
-- echo ' return "this_is_tar_ball_build";'; \
-- fi; \
-+ echo ' return "this_is_tar_ball_build";'; \
- echo '}' ) > defaults_tmp.cc
- @if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi
- @rm defaults_tmp.cc
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/fluxbox/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- pkg/PLIST 16 Apr 2013 15:27:03 - 1.1
