[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
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_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
[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
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_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
