cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to fluxbox-1.3.7

Browse Source 
OK bcallah@ (maintainer)
This commit is contained in:
dcoppa 2015-02-09 15:52:13 +00:00
parent 6fe0e4063c
commit 90fa34487a
5 changed files with 16 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/fluxbox/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.78 2015/01/21 08:52:04 dcoppa Exp $ # $OpenBSD: Makefile,v 1.79 2015/02/09 15:52:13 dcoppa Exp $
COMMENT = window manager based on the original Blackbox code COMMENT = window manager based on the original Blackbox code
DISTNAME = fluxbox-1.3.6 DISTNAME = fluxbox-1.3.7
REVISION = 0
CATEGORIES = x11 CATEGORIES = x11
HOMEPAGE = http://fluxbox.org/ HOMEPAGE = http://fluxbox.org/

4
x11/fluxbox/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (fluxbox-1.3.6.tar.gz) = y1TrYtPbovKCpQ+90HfSaiyfVVwStb9mSxGS7OdmlSc= SHA256 (fluxbox-1.3.7.tar.gz) = yZ4rqgb/8eljQrIEFQWdEv8fopF63gFzx1svpXApW58=
SIZE (fluxbox-1.3.6.tar.gz) = 1312141 SIZE (fluxbox-1.3.7.tar.gz) = 1267833

10
x11/fluxbox/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.3 2015/01/11 15:59:19 bcallah Exp $ $OpenBSD: patch-Makefile_in,v 1.4 2015/02/09 15:52:13 dcoppa Exp $
--- Makefile.in.orig Wed Jan 7 13:16:02 2015 --- Makefile.in.orig Sun Feb 8 04:44:52 2015
+++ Makefile.in Wed Jan 7 13:16:25 2015 +++ Makefile.in Mon Feb 9 04:26:49 2015
@@ -5234,7 +5234,6 @@ src/defaults.hh: @@ -5275,7 +5275,6 @@ src/defaults.hh:
src/defaults.cc: force src/defaults.cc: force
@( \ @( \
@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2015/01/11 15:59:19 bcallah Exp $
echo '// This file is generated from Makefile. Do not edit!'; \ echo '// This file is generated from Makefile. Do not edit!'; \
echo '#include "defaults.hh"'; \ echo '#include "defaults.hh"'; \
echo ''; \ echo ''; \
@@ -5243,11 +5242,7 @@ src/defaults.cc: force @@ -5284,11 +5283,7 @@ src/defaults.cc: force
echo '}'; \ echo '}'; \
echo ''; \ echo ''; \
echo 'const char* gitrevision() {'; \ echo 'const char* gitrevision() {'; \

39
x11/fluxbox/patches/patch-src_FbTk_TextButton_cc
View File

@ -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 <akira@fluxbox.org>
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,
unsigned int textlen = visual.size();
unsigned int button_width = width();
unsigned int button_height = height();
+ const int max_width = static_cast<int>(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

20
x11/fluxbox/patches/patch-util_fluxbox-generate_menu_in
View File

@ -1,21 +1,15 @@
$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.10 2013/04/16 15:27:03 bcallah Exp $ $OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.11 2015/02/09 15:52:13 dcoppa Exp $
Adapt to our non-GNU grep Adapt to our non-GNU grep
Remove bashisms --- util/fluxbox-generate_menu.in.orig Sun Feb 8 04:44:45 2015
(upstream git commit dcdfdfd56b5dbb6453062ad60876647b11433f18) +++ util/fluxbox-generate_menu.in Mon Feb 9 04:26:49 2015
Default browswer variable can be empty
(upstream git commit be2c52a146a013ebbfb708073317c337986371ff)
--- util/fluxbox-generate_menu.in.orig Sun Apr 7 18:18:38 2013
+++ util/fluxbox-generate_menu.in Sun Apr 7 18:19:53 2013
@@ -330,7 +330,7 @@ searchForIcon(){ @@ -330,7 +330,7 @@ searchForIcon(){
# echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>"
if [ -f "$entry_icon" ]; then if [ -f "$entry_icon" ]; then
# if icon exists and entry does not already exists, add it # if icon exists and entry does not already exists, add it
- if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then - if ! grep -q -m 1 "^.${execname}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
+ if ! grep -q "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then + if ! grep -q "^.${execname}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
else else
: echo "# mapping already exists for ${entry_exec}" >> $ICONMAPPING : echo "# mapping already exists for ${execname}" >> $ICONMAPPING