View | Details | Raw Unified | Return to bug 197693
Collapse All | Expand All

(-)Makefile (-2 / +1 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	fluxbox
4
PORTNAME=	fluxbox
5
PORTVERSION=	1.3.6
5
PORTVERSION=	1.3.7
6
PORTREVISION=	1
7
CATEGORIES=	x11-wm
6
CATEGORIES=	x11-wm
8
MASTER_SITES=	SF
7
MASTER_SITES=	SF
9
DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
8
DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
(-)distinfo (-2 / +2 lines)
Lines 1-5 Link Here
1
SHA256 (fluxbox-1.3.6.tar.gz) = cb54eb62d3dba2f282a50fbdd077d26a2c9f555c12b5bf664b1192ece7669527
1
SHA256 (fluxbox-1.3.7.tar.gz) = c99e2baa06fff1e96342b20415059d12ff1fa2917ade0173c75b2fa570295b9f
2
SIZE (fluxbox-1.3.6.tar.gz) = 1312141
2
SIZE (fluxbox-1.3.7.tar.gz) = 1267833
3
SHA256 (fb-doc-mfhtml-20060629.tgz) = 98d37b73dbb1caf1361b098bffc69d1f365f9b324a71f622ba72ed5da5d9b9ec
3
SHA256 (fb-doc-mfhtml-20060629.tgz) = 98d37b73dbb1caf1361b098bffc69d1f365f9b324a71f622ba72ed5da5d9b9ec
4
SIZE (fb-doc-mfhtml-20060629.tgz) = 115560
4
SIZE (fb-doc-mfhtml-20060629.tgz) = 115560
5
SHA256 (fluxbook-20060629.pdf) = 8f225b101e9ab81543182c83699aeef3fe86370d72da215831321c903eee9cde
5
SHA256 (fluxbook-20060629.pdf) = 8f225b101e9ab81543182c83699aeef3fe86370d72da215831321c903eee9cde
(-)files/patch-src__FbTk__TextButton.cc (-21 lines)
Lines 1-21 Link Here
1
--- src/FbTk/TextButton.cc	2015-01-28 11:12:27.000000000 +0200
2
+++ src/FbTk/TextButton.cc	2015-01-28 11:14:03.000000000 +0200
3
@@ -143,11 +143,17 @@
4
     unsigned int textlen = visual.size();
5
     unsigned int button_width = width();
6
     unsigned int button_height = height();
7
+    const int max_width = static_cast<int>(button_width) - x_offset -
8
+        m_left_padding - m_right_padding;
9
+
10
+    if (max_width <= bevel()) {
11
+        return;
12
+    }
13
 
14
     translateSize(m_orientation, button_width, button_height);
15
 
16
     // horizontal alignment, cut off text if needed
17
-    int align_x = FbTk::doAlignment(button_width - x_offset - m_left_padding - m_right_padding,
18
+    int align_x = FbTk::doAlignment(max_width,
19
                                     bevel(), justify(), font(),
20
                                     visual.data(), visual.size(),
21
                                     textlen); // return new text len
(-)files/patch-src__fluxbox.cc (-3 / +3 lines)
Lines 1-6 Link Here
1
--- ./src/fluxbox.cc.orig	2013-02-13 10:04:05.899812000 +0000
1
--- src/fluxbox.cc.orig	2015-02-08 10:44:45 UTC
2
+++ ./src/fluxbox.cc	2013-09-20 15:41:23.584087389 +0000
2
+++ src/fluxbox.cc
3
@@ -1355,7 +1355,7 @@
3
@@ -1316,7 +1316,7 @@ void Fluxbox::revertFocus() {
4
         FocusControl::setFocusedWindow(0);
4
         FocusControl::setFocusedWindow(0);
5
 }
5
 }
6
 
6
 
(-)files/patch-src__fluxbox.hh (-7 / +7 lines)
Lines 1-11 Link Here
1
--- ./src/fluxbox.hh.orig	2013-02-13 10:04:05.899812000 +0000
1
--- src/fluxbox.hh.orig	2015-02-08 10:44:45 UTC
2
+++ ./src/fluxbox.hh	2013-09-20 15:41:23.585087645 +0000
2
+++ src/fluxbox.hh
3
@@ -88,7 +88,7 @@
3
@@ -103,7 +103,7 @@ public:
4
     /// main event loop
4
     WinClient *searchWindow(Window);
5
     void eventLoop();
5
     BScreen *searchScreen(Window w);
6
     bool validateWindow(Window win) const;
6
     bool validateWindow(Window win) const;
7
-    bool validateClient(const WinClient *client) const;
7
-    bool validateClient(const WinClient *client) const;
8
+    bool validateClient(WinClient *client) const;
8
+    bool validateClient(WinClient *client) const;
9
 
9
 
10
     void grab();
10
     // Not currently implemented until we decide how it'll be used
11
     void ungrab();
11
     //WinClient *searchGroup(Window);
(-)files/patch-util__fluxbox-generate_menu.in (-34 / +24 lines)
Lines 1-6 Link Here
1
--- util/fluxbox-generate_menu.in.orig	2012-12-10 18:26:53.000000000 +0100
1
--- util/fluxbox-generate_menu.in.orig	2015-02-08 10:44:45 UTC
2
+++ util/fluxbox-generate_menu.in	2013-01-02 14:22:14.000000000 +0100
2
+++ util/fluxbox-generate_menu.in
3
@@ -68,7 +68,7 @@
3
@@ -68,7 +68,7 @@ Options:
4
     -d  Other path(s) to recursively search for *.desktop files
4
     -d  Other path(s) to recursively search for *.desktop files
5
     -ds Wider search for *.desktop files (takes more time)
5
     -ds Wider search for *.desktop files (takes more time)
6
     -i  Other path(s) to search for icons
6
     -i  Other path(s) to search for icons
Lines 9-15 Link Here
9
     -is Wider search for icons (worth the extra time)
9
     -is Wider search for icons (worth the extra time)
10
     -in Skip icon search
10
     -in Skip icon search
11
 
11
 
12
@@ -85,7 +85,7 @@
12
@@ -85,7 +85,7 @@ Options:
13
   Only for packagers:
13
   Only for packagers:
14
 
14
 
15
     -p  Prefix; default is @PREFIX@
15
     -p  Prefix; default is @PREFIX@
Lines 18-24 Link Here
18
     -q  KDE-prefix; idem dito
18
     -q  KDE-prefix; idem dito
19
 
19
 
20
 
20
 
21
@@ -145,13 +145,42 @@
21
@@ -145,13 +145,42 @@ testoption() {
22
     esac
22
     esac
23
 }
23
 }
24
 
24
 
Lines 67-73 Link Here
67
 
67
 
68
 #echo "replaceWithinString: $1, $2, $3" >&2
68
 #echo "replaceWithinString: $1, $2, $3" >&2
69
 #echo ${1//$2/$3} # causes error in BSD even though not used
69
 #echo ${1//$2/$3} # causes error in BSD even though not used
70
@@ -203,7 +232,7 @@
70
@@ -203,7 +232,7 @@ convertIcon(){
71
     if [ -f "${entry_icon}" ]; then
71
     if [ -f "${entry_icon}" ]; then
72
         : echo "File exists. To overwrite, type: convert \"$1\" \"$entry_icon\"" >&2
72
         : echo "File exists. To overwrite, type: convert \"$1\" \"$entry_icon\"" >&2
73
     else
73
     else
Lines 76-82 Link Here
76
             convert "$1" "$entry_icon"
76
             convert "$1" "$entry_icon"
77
             # echo convert "$1" , "$entry_icon" >> $ICONMAPPING
77
             # echo convert "$1" , "$entry_icon" >> $ICONMAPPING
78
         else
78
         else
79
@@ -275,7 +304,7 @@
79
@@ -275,7 +304,7 @@ doSearch(){
80
     # echo -n "for $temp_icon"
80
     # echo -n "for $temp_icon"
81
     eval doSearchLoop $USER_ICONPATHS \
81
     eval doSearchLoop $USER_ICONPATHS \
82
       "$FB_ICONDIR" \
82
       "$FB_ICONDIR" \
Lines 85-91 Link Here
85
       ${OTHER_ICONPATHS} \
85
       ${OTHER_ICONPATHS} \
86
 
86
 
87
 
87
 
88
@@ -558,7 +587,7 @@
88
@@ -558,7 +587,7 @@ rm -f ${MENUFILENAME}.tmp
89
 
89
 
90
 
90
 
91
 WHOAMI=`whoami`
91
 WHOAMI=`whoami`
Lines 94-100 Link Here
94
 
94
 
95
 # Check for Imlib2-support
95
 # Check for Imlib2-support
96
 if @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep -q "^IMLIB"; then
96
 if @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep -q "^IMLIB"; then
97
@@ -1271,16 +1300,16 @@
97
@@ -1271,16 +1300,16 @@ if [ ! "${INSTALL}" = Yes ]; then
98
 # These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox
98
 # These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox
99
 # your prefix is: @PREFIX@
99
 # your prefix is: @PREFIX@
100
 
100
 
Lines 115-121 Link Here
115
 
115
 
116
 
116
 
117
 # --- Boolean variables.
117
 # --- Boolean variables.
118
@@ -1327,29 +1356,21 @@
118
@@ -1327,29 +1356,21 @@ while [ $# -gt 0 ]; do
119
         -g) GNOMEMENU=yes; shift;;
119
         -g) GNOMEMENU=yes; shift;;
120
         -in) NO_ICON=yes; shift;;
120
         -in) NO_ICON=yes; shift;;
121
         -is) OTHER_ICONPATHS="
121
         -is) OTHER_ICONPATHS="
Lines 157-163 Link Here
157
             "
157
             "
158
             # /usr/share/apps \
158
             # /usr/share/apps \
159
             shift;;
159
             shift;;
160
@@ -1420,13 +1441,12 @@
160
@@ -1420,13 +1441,12 @@ fi
161
 # prefix
161
 # prefix
162
 PREFIX="${PREFIX:=@PREFIX@}"
162
 PREFIX="${PREFIX:=@PREFIX@}"
163
 if [  -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then
163
 if [  -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then
Lines 173-179 Link Here
173
     if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
173
     if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then
174
         break;
174
         break;
175
     fi
175
     fi
176
@@ -1434,7 +1454,7 @@
176
@@ -1434,7 +1454,7 @@ done
177
 # Will remain $PREFIX if all else fails
177
 # Will remain $PREFIX if all else fails
178
 
178
 
179
 # kde prefix
179
 # kde prefix
Lines 182-219 Link Here
182
     if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
182
     if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then
183
         break;
183
         break;
184
     fi
184
     fi
185
@@ -1522,7 +1542,7 @@
185
@@ -1522,7 +1542,7 @@ if find_it_options $MY_BROWSER; then
186
 else
186
 else
187
     [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
187
     [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
188
     #The precise order is up for debate.
188
     #The precise order is up for debate.
189
-    for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
189
-    for browser in firefox mozilla-firefox chrome chromium google-chrome mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
190
+    for browser in chrome firefox mozilla-firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
190
+    for browser in firefox mozilla-firefox chrome chromium google-chrome mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
191
         if find_it_options $browser; then
191
         if find_it_options $browser; then
192
             DEFAULT_BROWSER=$browser
192
             DEFAULT_BROWSER=$browser
193
             break
193
             break
194
@@ -1581,9 +1601,10 @@
194
@@ -1589,6 +1609,7 @@ case "$DEFAULT_BROWSERNAME" in
195
 
195
     chrome|chromium) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
196
 case "$DEFAULT_BROWSERNAME" in
196
     google-chrome) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
197
     links|w3m|lynx)  append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
198
-    firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
199
+    chrome|firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
200
     konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
197
     konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
201
-    opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
198
+    linux-opera) append "[exec] (linux-opera) {env QT_XFT=true linux-opera}" ;;
202
+    linux-opera) append "[exec] (linux-opera) {linux-opera}" ;;
199
     opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
203
+    opera) append "[exec] (opera) {opera}" ;;
204
     MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
200
     MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
205
     MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
201
     MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
206
     *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
202
@@ -1608,6 +1629,7 @@ append_submenu "${NETMENU}"
207
@@ -1600,9 +1621,10 @@
208
 
209
 append_submenu "${NETMENU}"
210
     append_submenu "${BROWSERMENU}"
203
     append_submenu "${BROWSERMENU}"
211
-        normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
204
         normal_find chrome chromium firefox google-chrome mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
212
+        normal_find chrome firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
213
         find_it links       append "[exec]   (links-graphic) {links -driver x ${HOMEPAGE}}"
205
         find_it links       append "[exec]   (links-graphic) {links -driver x ${HOMEPAGE}}"
214
-        find_it opera       append "[exec]   (opera) {env QT_XFT=true opera}"
206
+        find_it linux-opera append "[exec]   (linux-opera) {env QT_XFT=true opera}"
215
+        find_it linux-opera append "[exec]   (linux-opera) {linux-opera}"
207
         find_it opera       append "[exec]   (opera) {env QT_XFT=true opera}"
216
+        find_it opera       append "[exec]   (opera) {opera}"
217
         find_it konqueror   append "[exec]   (konqueror) {kfmclient openProfile webbrowsing}"
208
         find_it konqueror   append "[exec]   (konqueror) {kfmclient openProfile webbrowsing}"
218
         find_it links       append "[exec]   (links) {${DEFAULT_TERM} -e links ${HOMEPAGE}}"
209
         find_it links       append "[exec]   (links) {${DEFAULT_TERM} -e links ${HOMEPAGE}}"
219
         find_it w3m         append "[exec]   (w3m) {${DEFAULT_TERM} -e w3m ${HOMEPAGE}}"

Return to bug 197693