[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Saturday, April 18, 2020 @ 19:50:34 Author: eworm Revision: 380501 upgpkg: fluxbox 1.3.7-6 rebuild old package Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-04-18 18:56:42 UTC (rev 380500) +++ PKGBUILD2020-04-18 19:50:34 UTC (rev 380501) @@ -2,7 +2,7 @@ pkgname=fluxbox pkgver=1.3.7 -pkgrel=5 +pkgrel=6 pkgdesc="A lightweight and highly-configurable window manager" arch=('x86_64') url="http://www.fluxbox.org;
[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Thursday, April 26, 2018 @ 09:54:40 Author: eworm Revision: 323023 upgpkg: fluxbox 1.3.7-4 rebuild Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-04-26 09:50:09 UTC (rev 323022) +++ PKGBUILD2018-04-26 09:54:40 UTC (rev 323023) @@ -3,7 +3,7 @@ pkgname=fluxbox pkgver=1.3.7 -pkgrel=3 +pkgrel=4 pkgdesc="A lightweight and highly-configurable window manager" arch=('x86_64') url="http://www.fluxbox.org;
[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Thursday, April 26, 2018 @ 09:50:09 Author: eworm Revision: 323022 line break configure options Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-04-26 00:24:51 UTC (rev 323021) +++ PKGBUILD2018-04-26 09:50:09 UTC (rev 323022) @@ -18,14 +18,19 @@ build() { cd ${pkgname}-${pkgver} - ./configure --prefix=/usr \ ---enable-xft --enable-xinerama \ ---enable-imlib2 --enable-nls + + ./configure \ +--prefix=/usr \ +--enable-imlib2 \ +--enable-nls \ +--enable-xft \ +--enable-xinerama make } package() { cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install install -D -m644 "${srcdir}/fluxbox.desktop" "${pkgdir}/usr/share/xsessions/fluxbox.desktop" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Tuesday, January 16, 2018 @ 00:29:49 Author: eworm Revision: 314941 download from https, use sha256 checksums Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-01-16 00:19:56 UTC (rev 314940) +++ PKGBUILD2018-01-16 00:29:49 UTC (rev 314941) @@ -11,10 +11,10 @@ depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'imlib2' 'fribidi') optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities') options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz -fluxbox.desktop) -sha1sums=('c53940f5b70dfad39f4a3fa6b0e95072c2b3e9db' - 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') +source=("https://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz; +'fluxbox.desktop') +sha256sums=('fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0' +'2148a90aca653b596e9632264dbdbd8c7e673d732e4b04eee66a8ac1e68b3c5d') build() { cd ${pkgname}-${pkgver}
[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Tuesday, January 16, 2018 @ 00:19:42 Author: eworm Revision: 314939 upgpkg: fluxbox 1.3.7-3 rebuild old package Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-01-15 22:59:24 UTC (rev 314938) +++ PKGBUILD2018-01-16 00:19:42 UTC (rev 314939) @@ -3,7 +3,7 @@ pkgname=fluxbox pkgver=1.3.7 -pkgrel=2 +pkgrel=3 pkgdesc="A lightweight and highly-configurable window manager" arch=('x86_64') url="http://www.fluxbox.org;
[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Monday, December 7, 2015 @ 00:21:00 Author: bpiotrowski Revision: 253076 C++11 ABI rebuild Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-12-06 23:17:05 UTC (rev 253075) +++ PKGBUILD2015-12-06 23:21:00 UTC (rev 253076) @@ -3,7 +3,7 @@ pkgname=fluxbox pkgver=1.3.7 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight and highly-configurable window manager" arch=('i686' 'x86_64') url="http://www.fluxbox.org;
[arch-commits] Commit in fluxbox/trunk (PKGBUILD fluxbox.patch)
Date: Monday, February 9, 2015 @ 21:20:40 Author: eric Revision: 231194 upgpkg: fluxbox 1.3.7-1 Upstream update Modified: fluxbox/trunk/PKGBUILD Deleted: fluxbox/trunk/fluxbox.patch ---+ PKGBUILD | 14 -- fluxbox.patch | 23 --- 2 files changed, 4 insertions(+), 33 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-02-09 19:09:02 UTC (rev 231193) +++ PKGBUILD2015-02-09 20:20:40 UTC (rev 231194) @@ -2,7 +2,7 @@ # Maintainer: Eric Bélanger e...@archlinux.org pkgname=fluxbox -pkgver=1.3.6 +pkgver=1.3.7 pkgrel=1 pkgdesc=A lightweight and highly-configurable window manager arch=('i686' 'x86_64') @@ -12,16 +12,10 @@ optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz -fluxbox.desktop fluxbox.patch) -sha1sums=('2bcf7a02394b01652be05f6b6108a1e67a12afb5' - 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8' - '2718219744cf0f588ce90074a38317699e720ac0') +fluxbox.desktop) +sha1sums=('c53940f5b70dfad39f4a3fa6b0e95072c2b3e9db' + 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/fluxbox.patch -} - build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ Deleted: fluxbox.patch === --- fluxbox.patch 2015-02-09 19:09:02 UTC (rev 231193) +++ fluxbox.patch 2015-02-09 20:20:40 UTC (rev 231194) @@ -1,23 +0,0 @@ -diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc -index 611580c..a177f25 100644 a/src/FbTk/TextButton.cc -+++ b/src/FbTk/TextButton.cc -@@ -143,11 +143,17 @@ void TextButton::drawText(int x_offset, int y_offset, FbDrawable *drawable) { - unsigned int textlen = visual.size(); - unsigned int button_width = width(); - unsigned int button_height = height(); -+const int max_width = static_castint(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
[arch-commits] Commit in fluxbox/trunk (PKGBUILD fluxbox.patch)
Date: Monday, January 19, 2015 @ 05:48:51 Author: eric Revision: 229564 upgpkg: fluxbox 1.3.6-1 Upstream update Added: fluxbox/trunk/fluxbox.patch Modified: fluxbox/trunk/PKGBUILD ---+ PKGBUILD | 17 + fluxbox.patch | 23 +++ 2 files changed, 32 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-01-19 04:05:07 UTC (rev 229563) +++ PKGBUILD2015-01-19 04:48:51 UTC (rev 229564) @@ -2,23 +2,24 @@ # Maintainer: Eric Bélanger e...@archlinux.org pkgname=fluxbox -pkgver=1.3.5 -pkgrel=4 +pkgver=1.3.6 +pkgrel=1 pkgdesc=A lightweight and highly-configurable window manager arch=('i686' 'x86_64') url=http://www.fluxbox.org; license=('MIT') -depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'imlib2' 'fribidi') +depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'imlib2' 'fribidi') optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities') options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.lzma \ -fluxbox.desktop) -sha1sums=('495d82ca428949cc2bc85814898b49cf4624b7cb' - 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz +fluxbox.desktop fluxbox.patch) +sha1sums=('2bcf7a02394b01652be05f6b6108a1e67a12afb5' + 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8' + '2718219744cf0f588ce90074a38317699e720ac0') prepare() { cd ${pkgname}-${pkgver} - sed -i 's/@EXEEXT@//g' util/fluxbox-generate_menu.in #share/fluxbox/menu} + patch -p1 -i ${srcdir}/fluxbox.patch } build() { Added: fluxbox.patch === --- fluxbox.patch (rev 0) +++ fluxbox.patch 2015-01-19 04:48:51 UTC (rev 229564) @@ -0,0 +1,23 @@ +diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc +index 611580c..a177f25 100644 +--- a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc +@@ -143,11 +143,17 @@ void TextButton::drawText(int x_offset, int y_offset, FbDrawable *drawable) { + unsigned int textlen = visual.size(); + unsigned int button_width = width(); + unsigned int button_height = height(); ++const int max_width = static_castint(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
[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Sunday, July 6, 2014 @ 21:21:52 Author: eric Revision: 216575 upgpkg: fluxbox 1.3.5-4 Fix xinerama support (close FS#41113) Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-07-06 19:16:16 UTC (rev 216574) +++ PKGBUILD2014-07-06 19:21:52 UTC (rev 216575) @@ -3,7 +3,7 @@ pkgname=fluxbox pkgver=1.3.5 -pkgrel=3 +pkgrel=4 pkgdesc=A lightweight and highly-configurable window manager arch=('i686' 'x86_64') url=http://www.fluxbox.org; @@ -26,7 +26,6 @@ ./configure --prefix=/usr \ --enable-xft --enable-xinerama \ --enable-imlib2 --enable-nls - sed -i 's/@my_libs@//' {,*/,*/*/}Makefile make }
[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Saturday, July 5, 2014 @ 04:15:17 Author: eric Revision: 216534 upgpkg: fluxbox 1.3.5-3 Rebuild to add mtree file Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-07-05 00:36:46 UTC (rev 216533) +++ PKGBUILD2014-07-05 02:15:17 UTC (rev 216534) @@ -3,7 +3,7 @@ pkgname=fluxbox pkgver=1.3.5 -pkgrel=2 +pkgrel=3 pkgdesc=A lightweight and highly-configurable window manager arch=('i686' 'x86_64') url=http://www.fluxbox.org; @@ -16,19 +16,23 @@ sha1sums=('495d82ca428949cc2bc85814898b49cf4624b7cb' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') +prepare() { + cd ${pkgname}-${pkgver} + sed -i 's/@EXEEXT@//g' util/fluxbox-generate_menu.in #share/fluxbox/menu} +} + build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --enable-xft --enable-xinerama \ --enable-imlib2 --enable-nls + sed -i 's/@my_libs@//' {,*/,*/*/}Makefile make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - sed -i 's/@EXEEXT@//g' ${pkgdir}/usr/{bin/fluxbox-generate_menu,share/fluxbox/menu} - - install -D -m644 ../fluxbox.desktop ${pkgdir}/usr/share/xsessions/fluxbox.desktop + install -D -m644 ${srcdir}/fluxbox.desktop ${pkgdir}/usr/share/xsessions/fluxbox.desktop install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE }
[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Thursday, April 4, 2013 @ 07:03:36 Author: eric Revision: 181688 upgpkg: fluxbox 1.3.5-2 Fix scripts (close FS#34584) Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-04-04 04:36:45 UTC (rev 181687) +++ PKGBUILD2013-04-04 05:03:36 UTC (rev 181688) @@ -3,7 +3,7 @@ pkgname=fluxbox pkgver=1.3.5 -pkgrel=1 +pkgrel=2 pkgdesc=A lightweight and highly-configurable window manager arch=('i686' 'x86_64') url=http://www.fluxbox.org; @@ -27,6 +27,8 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install + sed -i 's/@EXEEXT@//g' ${pkgdir}/usr/{bin/fluxbox-generate_menu,share/fluxbox/menu} + install -D -m644 ../fluxbox.desktop ${pkgdir}/usr/share/xsessions/fluxbox.desktop install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE }
[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Wednesday, February 13, 2013 @ 23:21:35 Author: eric Revision: 178031 upgpkg: fluxbox 1.3.5-1 Upstream update Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-02-13 22:13:45 UTC (rev 178030) +++ PKGBUILD2013-02-13 22:21:35 UTC (rev 178031) @@ -2,7 +2,7 @@ # Maintainer: Eric Bélanger e...@archlinux.org pkgname=fluxbox -pkgver=1.3.4 +pkgver=1.3.5 pkgrel=1 pkgdesc=A lightweight and highly-configurable window manager arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.lzma \ fluxbox.desktop) -sha1sums=('8a4f0d79238609523e1127808d9d2eab15030ea0' +sha1sums=('495d82ca428949cc2bc85814898b49cf4624b7cb' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') build() {
[arch-commits] Commit in fluxbox/trunk (PKGBUILD fluxbox-fix_timer.diff)
Date: Monday, February 11, 2013 @ 03:54:01 Author: eric Revision: 177925 upgpkg: fluxbox 1.3.4-1 Upstream update, Remove old patch Modified: fluxbox/trunk/PKGBUILD Deleted: fluxbox/trunk/fluxbox-fix_timer.diff + PKGBUILD | 12 +++ fluxbox-fix_timer.diff | 78 --- 2 files changed, 5 insertions(+), 85 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-02-10 19:24:40 UTC (rev 177924) +++ PKGBUILD2013-02-11 02:54:01 UTC (rev 177925) @@ -2,8 +2,8 @@ # Maintainer: Eric Bélanger e...@archlinux.org pkgname=fluxbox -pkgver=1.3.3 -pkgrel=2 +pkgver=1.3.4 +pkgrel=1 pkgdesc=A lightweight and highly-configurable window manager arch=('i686' 'x86_64') url=http://www.fluxbox.org; @@ -12,14 +12,12 @@ optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.lzma \ -fluxbox.desktop fluxbox-fix_timer.diff) -sha1sums=('6892259dd495424291194fde242230cca95abce3' - 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8' - 'bc10368d7a157f83428897e2b7aced7ce620dec3') +fluxbox.desktop) +sha1sums=('8a4f0d79238609523e1127808d9d2eab15030ea0' + 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/fluxbox-fix_timer.diff ./configure --prefix=/usr \ --enable-xft --enable-xinerama \ --enable-imlib2 --enable-nls Deleted: fluxbox-fix_timer.diff === --- fluxbox-fix_timer.diff 2013-02-10 19:24:40 UTC (rev 177924) +++ fluxbox-fix_timer.diff 2013-02-11 02:54:01 UTC (rev 177925) @@ -1,78 +0,0 @@ -From 4d307dcd10af9d817ff5c05fc40ae7487564cb31 Mon Sep 17 00:00:00 2001 -From: Mathias Gumz akira at fluxbox dot org -Date: Sat, 12 Jan 2013 08:24:11 + -Subject: Fix bug: handle the list of Timers not in-place - -With commit 541c8c4 we switched from an (manually) ordered list to a -std::set to handle the active timers. The code which checks for overdue -timers now traverses and modifies the std::set in place. This might -lead to an infinite loop. Examples of such bad behavior are flickering of -the tooltip (bug #3590078) or crashes (bug #3600143) or just insanely high -cpu load when autoraising windows or submenus. - -We now make a copy of the std::set traverse this instead of the original. -diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc -index f63ea38..dd736dd 100644 a/src/FbTk/Timer.cc -+++ b/src/FbTk/Timer.cc -@@ -52,6 +52,7 @@ - #endif - - #include cstdio -+#include vector - #include set - - -@@ -195,32 +196,35 @@ void Timer::updateTimers(int fd) { - return; - } - -+// stoping / restarting the timers modifies the list in an upredictable -+// way. to avoid problems such as infinite loops we save the current -+// (ordered) list of timers into a list and work on it. -+ -+ssize_t i; -+const ssize_t ts = s_timerlist.size(); -+std::vectorFbTk::Timer* timers; -+ -+timers.reserve(ts); -+for (it = s_timerlist.begin(); it != s_timerlist.end(); ++it ) { -+timers.push_back(*it); -+} -+ - now = FbTime::now(); --for (it = s_timerlist.begin(); it != s_timerlist.end(); ) { -+for (i = 0; i ts; ++i) { -+ -+FbTk::Timer* t = timers[i]; - --// t-fireTimeout() might add timers to the list --// this invalidates 'it'. thus we store the current timer --Timer* t = *it; - if (now t-getEndTime()) { - break; - } - - t-fireTimeout(); -- --// find the iterator to the timer again --// and continue working on the list --it = s_timerlist.find(t); --it++; --s_timerlist.erase(t); -+t-stop(); - - if (! t-doOnce()) { // restart the current timer --t-m_timing = false; - t-start(); --} else { --t-stop(); - } - } -- - } - - --- -cgit v0.9.1
[arch-commits] Commit in fluxbox/trunk (PKGBUILD fluxbox-fix_timer.diff)
Date: Wednesday, February 6, 2013 @ 04:07:10 Author: eric Revision: 177082 upgpkg: fluxbox 1.3.3-2 Fix timer issue (close FS#33362) Added: fluxbox/trunk/fluxbox-fix_timer.diff Modified: fluxbox/trunk/PKGBUILD + PKGBUILD |8 +++- fluxbox-fix_timer.diff | 78 +++ 2 files changed, 83 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-02-05 23:18:31 UTC (rev 177081) +++ PKGBUILD2013-02-06 03:07:10 UTC (rev 177082) @@ -3,7 +3,7 @@ pkgname=fluxbox pkgver=1.3.3 -pkgrel=1 +pkgrel=2 pkgdesc=A lightweight and highly-configurable window manager arch=('i686' 'x86_64') url=http://www.fluxbox.org; @@ -12,12 +12,14 @@ optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.lzma \ -fluxbox.desktop) +fluxbox.desktop fluxbox-fix_timer.diff) sha1sums=('6892259dd495424291194fde242230cca95abce3' - 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') + 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8' + 'bc10368d7a157f83428897e2b7aced7ce620dec3') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/fluxbox-fix_timer.diff ./configure --prefix=/usr \ --enable-xft --enable-xinerama \ --enable-imlib2 --enable-nls Added: fluxbox-fix_timer.diff === --- fluxbox-fix_timer.diff (rev 0) +++ fluxbox-fix_timer.diff 2013-02-06 03:07:10 UTC (rev 177082) @@ -0,0 +1,78 @@ +From 4d307dcd10af9d817ff5c05fc40ae7487564cb31 Mon Sep 17 00:00:00 2001 +From: Mathias Gumz akira at fluxbox dot org +Date: Sat, 12 Jan 2013 08:24:11 + +Subject: Fix bug: handle the list of Timers not in-place + +With commit 541c8c4 we switched from an (manually) ordered list to a +std::set to handle the active timers. The code which checks for overdue +timers now traverses and modifies the std::set in place. This might +lead to an infinite loop. Examples of such bad behavior are flickering of +the tooltip (bug #3590078) or crashes (bug #3600143) or just insanely high +cpu load when autoraising windows or submenus. + +We now make a copy of the std::set traverse this instead of the original. +--- +diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc +index f63ea38..dd736dd 100644 +--- a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc +@@ -52,6 +52,7 @@ + #endif + + #include cstdio ++#include vector + #include set + + +@@ -195,32 +196,35 @@ void Timer::updateTimers(int fd) { + return; + } + ++// stoping / restarting the timers modifies the list in an upredictable ++// way. to avoid problems such as infinite loops we save the current ++// (ordered) list of timers into a list and work on it. ++ ++ssize_t i; ++const ssize_t ts = s_timerlist.size(); ++std::vectorFbTk::Timer* timers; ++ ++timers.reserve(ts); ++for (it = s_timerlist.begin(); it != s_timerlist.end(); ++it ) { ++timers.push_back(*it); ++} ++ + now = FbTime::now(); +-for (it = s_timerlist.begin(); it != s_timerlist.end(); ) { ++for (i = 0; i ts; ++i) { ++ ++FbTk::Timer* t = timers[i]; + +-// t-fireTimeout() might add timers to the list +-// this invalidates 'it'. thus we store the current timer +-Timer* t = *it; + if (now t-getEndTime()) { + break; + } + + t-fireTimeout(); +- +-// find the iterator to the timer again +-// and continue working on the list +-it = s_timerlist.find(t); +-it++; +-s_timerlist.erase(t); ++t-stop(); + + if (! t-doOnce()) { // restart the current timer +-t-m_timing = false; + t-start(); +-} else { +-t-stop(); + } + } +- + } + + +-- +cgit v0.9.1
[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Thursday, January 3, 2013 @ 23:35:32 Author: eric Revision: 174299 upgpkg: fluxbox 1.3.3-1 Upstream update Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-01-04 04:29:45 UTC (rev 174298) +++ PKGBUILD2013-01-04 04:35:32 UTC (rev 174299) @@ -2,7 +2,7 @@ # Maintainer: Eric Bélanger e...@archlinux.org pkgname=fluxbox -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=1 pkgdesc=A lightweight and highly-configurable window manager arch=('i686' 'x86_64') @@ -11,9 +11,9 @@ depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'imlib2' 'fribidi') optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities') options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \ +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.lzma \ fluxbox.desktop) -sha1sums=('15ba1b9eaaf170d87fa647b7118a63c05f093b5c' +sha1sums=('6892259dd495424291194fde242230cca95abce3' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') build() {
[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Saturday, October 29, 2011 @ 23:07:36 Author: eric Revision: 141365 upgpkg: fluxbox 1.3.2-1 Upstream update, Clean up depends and makedepends Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-10-30 02:28:27 UTC (rev 141364) +++ PKGBUILD2011-10-30 03:07:36 UTC (rev 141365) @@ -2,25 +2,24 @@ # Maintainer: Eric Bélanger e...@archlinux.org pkgname=fluxbox -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc=A lightweight and highly-configurable window manager arch=('i686' 'x86_64') url=http://www.fluxbox.org; license=('MIT') -depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'sh' 'imlib2' 'fribidi') -makedepends=('pkg-config') +depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'imlib2' 'fribidi') optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities') options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \ fluxbox.desktop) -md5sums=('0eaa940a69c0a876a520bb85d67b8bec' 'eeae9c88a2526ac0bd8afcd9ce97f9ed') -sha1sums=('1c4755b8ac1042c98f700848240ac99ef18dca01' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') +sha1sums=('15ba1b9eaaf170d87fa647b7118a63c05f093b5c' + 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ ---enable-gnome --enable-xft --enable-xinerama \ +--enable-xft --enable-xinerama \ --enable-imlib2 --enable-nls make }
[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Sunday, February 27, 2011 @ 19:45:15 Author: eric Revision: 111648 upgpkg: fluxbox 1.3.1-1 Upstream update Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-28 00:40:57 UTC (rev 111647) +++ PKGBUILD2011-02-28 00:45:15 UTC (rev 111648) @@ -2,7 +2,7 @@ # Maintainer: Eric Bélanger e...@archlinux.org pkgname=fluxbox -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=1 pkgdesc=A lightweight and highly-configurable window manager arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ fluxbox.desktop) -md5sums=('817ffe734b8ebb1aa4b9c53ed208c23f' 'eeae9c88a2526ac0bd8afcd9ce97f9ed') -sha1sums=('b4b1732f1c3ad9499cd9ec0aa03fbaee59c69d49' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') +md5sums=('0eaa940a69c0a876a520bb85d67b8bec' 'eeae9c88a2526ac0bd8afcd9ce97f9ed') +sha1sums=('1c4755b8ac1042c98f700848240ac99ef18dca01' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') build() { cd ${srcdir}/${pkgname}-${pkgver}
[arch-commits] Commit in fluxbox/trunk (PKGBUILD)
Date: Saturday, February 19, 2011 @ 16:51:38 Author: eric Revision: 110541 upgpkg: fluxbox 1.3.0-1 Upstream update, Added fribidi support, Added xorg-xmessage optdepends Modified: fluxbox/trunk/PKGBUILD --+ PKGBUILD | 18 -- 1 file changed, 8 insertions(+), 10 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-02-19 19:46:55 UTC (rev 110540) +++ PKGBUILD2011-02-19 21:51:38 UTC (rev 110541) @@ -1,26 +1,26 @@ # $Id$ -# Maintainer: Eric Belanger e...@archlinux.org +# Maintainer: Eric Bélanger e...@archlinux.org pkgname=fluxbox -pkgver=1.1.1 +pkgver=1.3.0 pkgrel=1 pkgdesc=A lightweight and highly-configurable window manager arch=('i686' 'x86_64') url=http://www.fluxbox.org; license=('MIT') -depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'sh' 'imlib2') +depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'sh' 'imlib2' 'fribidi') makedepends=('pkg-config') +optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ fluxbox.desktop) -md5sums=('fa9fa8fe9a44f86522de5754f8b285ca' 'eeae9c88a2526ac0bd8afcd9ce97f9ed') -sha1sums=('6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') +md5sums=('817ffe734b8ebb1aa4b9c53ed208c23f' 'eeae9c88a2526ac0bd8afcd9ce97f9ed') +sha1sums=('b4b1732f1c3ad9499cd9ec0aa03fbaee59c69d49' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ ---enable-kde --enable-gnome \ ---enable-xft --enable-xinerama \ +--enable-gnome --enable-xft --enable-xinerama \ --enable-imlib2 --enable-nls make } @@ -28,8 +28,6 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - # this is a fix to allow fluxbox to shutdown, but this can be changed by the user :-( - sed -i 's|^.*slit\.autoHide.*$|session.screen0.slit.autoHide: True|' ${pkgdir}/usr/share/fluxbox/init install -D -m644 ../fluxbox.desktop ${pkgdir}/usr/share/xsessions/fluxbox.desktop - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE }