[arch-commits] Commit in fluxbox/repos (10 files)
Eric Bélanger
eric at archlinux.org
Mon Feb 9 20:22:56 UTC 2015
Date: Monday, February 9, 2015 @ 21:22:56
Author: eric
Revision: 231195
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
fluxbox/repos/extra-i686/PKGBUILD
(from rev 231194, fluxbox/trunk/PKGBUILD)
fluxbox/repos/extra-i686/fluxbox.desktop
(from rev 231194, fluxbox/trunk/fluxbox.desktop)
fluxbox/repos/extra-x86_64/PKGBUILD
(from rev 231194, fluxbox/trunk/PKGBUILD)
fluxbox/repos/extra-x86_64/fluxbox.desktop
(from rev 231194, fluxbox/trunk/fluxbox.desktop)
Deleted:
fluxbox/repos/extra-i686/PKGBUILD
fluxbox/repos/extra-i686/fluxbox.desktop
fluxbox/repos/extra-i686/fluxbox.patch
fluxbox/repos/extra-x86_64/PKGBUILD
fluxbox/repos/extra-x86_64/fluxbox.desktop
fluxbox/repos/extra-x86_64/fluxbox.patch
------------------------------+
/PKGBUILD | 64 +++++++++++++++++++++++++++++++++++++++++
/fluxbox.desktop | 12 +++++++
extra-i686/PKGBUILD | 38 ------------------------
extra-i686/fluxbox.desktop | 6 ---
extra-i686/fluxbox.patch | 23 --------------
extra-x86_64/PKGBUILD | 38 ------------------------
extra-x86_64/fluxbox.desktop | 6 ---
extra-x86_64/fluxbox.patch | 23 --------------
8 files changed, 76 insertions(+), 134 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-02-09 20:20:40 UTC (rev 231194)
+++ extra-i686/PKGBUILD 2015-02-09 20:22:56 UTC (rev 231195)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=fluxbox
-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' '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 fluxbox.patch)
-sha1sums=('2bcf7a02394b01652be05f6b6108a1e67a12afb5'
- 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8'
- '2718219744cf0f588ce90074a38317699e720ac0')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}/fluxbox.patch"
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --enable-xft --enable-xinerama \
- --enable-imlib2 --enable-nls
- 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"
-}
Copied: fluxbox/repos/extra-i686/PKGBUILD (from rev 231194, fluxbox/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-02-09 20:22:56 UTC (rev 231195)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=fluxbox
+pkgver=1.3.7
+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' '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')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --enable-xft --enable-xinerama \
+ --enable-imlib2 --enable-nls
+ 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"
+}
Deleted: extra-i686/fluxbox.desktop
===================================================================
--- extra-i686/fluxbox.desktop 2015-02-09 20:20:40 UTC (rev 231194)
+++ extra-i686/fluxbox.desktop 2015-02-09 20:22:56 UTC (rev 231195)
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=XSession
-Exec=/usr/bin/startfluxbox
-TryExec=/usr/bin/startfluxbox
-Name=fluxbox
Copied: fluxbox/repos/extra-i686/fluxbox.desktop (from rev 231194, fluxbox/trunk/fluxbox.desktop)
===================================================================
--- extra-i686/fluxbox.desktop (rev 0)
+++ extra-i686/fluxbox.desktop 2015-02-09 20:22:56 UTC (rev 231195)
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=XSession
+Exec=/usr/bin/startfluxbox
+TryExec=/usr/bin/startfluxbox
+Name=fluxbox
Deleted: extra-i686/fluxbox.patch
===================================================================
--- extra-i686/fluxbox.patch 2015-02-09 20:20:40 UTC (rev 231194)
+++ extra-i686/fluxbox.patch 2015-02-09 20:22:56 UTC (rev 231195)
@@ -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<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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-02-09 20:20:40 UTC (rev 231194)
+++ extra-x86_64/PKGBUILD 2015-02-09 20:22:56 UTC (rev 231195)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=fluxbox
-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' '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 fluxbox.patch)
-sha1sums=('2bcf7a02394b01652be05f6b6108a1e67a12afb5'
- 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8'
- '2718219744cf0f588ce90074a38317699e720ac0')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}/fluxbox.patch"
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --enable-xft --enable-xinerama \
- --enable-imlib2 --enable-nls
- 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"
-}
Copied: fluxbox/repos/extra-x86_64/PKGBUILD (from rev 231194, fluxbox/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-02-09 20:22:56 UTC (rev 231195)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=fluxbox
+pkgver=1.3.7
+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' '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')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --enable-xft --enable-xinerama \
+ --enable-imlib2 --enable-nls
+ 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"
+}
Deleted: extra-x86_64/fluxbox.desktop
===================================================================
--- extra-x86_64/fluxbox.desktop 2015-02-09 20:20:40 UTC (rev 231194)
+++ extra-x86_64/fluxbox.desktop 2015-02-09 20:22:56 UTC (rev 231195)
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=XSession
-Exec=/usr/bin/startfluxbox
-TryExec=/usr/bin/startfluxbox
-Name=fluxbox
Copied: fluxbox/repos/extra-x86_64/fluxbox.desktop (from rev 231194, fluxbox/trunk/fluxbox.desktop)
===================================================================
--- extra-x86_64/fluxbox.desktop (rev 0)
+++ extra-x86_64/fluxbox.desktop 2015-02-09 20:22:56 UTC (rev 231195)
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=XSession
+Exec=/usr/bin/startfluxbox
+TryExec=/usr/bin/startfluxbox
+Name=fluxbox
Deleted: extra-x86_64/fluxbox.patch
===================================================================
--- extra-x86_64/fluxbox.patch 2015-02-09 20:20:40 UTC (rev 231194)
+++ extra-x86_64/fluxbox.patch 2015-02-09 20:22:56 UTC (rev 231195)
@@ -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<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
More information about the arch-commits
mailing list