[arch-commits] Commit in openbox/repos (12 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Fri Aug 30 15:52:26 UTC 2013
Date: Friday, August 30, 2013 @ 17:52:24
Author: bpiotrowski
Revision: 96487
archrelease: copy trunk to community-i686, community-x86_64
Added:
openbox/repos/community-i686/PKGBUILD
(from rev 96486, openbox/trunk/PKGBUILD)
openbox/repos/community-i686/openbox-3.5.0-title-matching.patch
(from rev 96486, openbox/trunk/openbox-3.5.0-title-matching.patch)
openbox/repos/community-i686/openbox-3.5.0-which-2.20.patch
(from rev 96486, openbox/trunk/openbox-3.5.0-which-2.20.patch)
openbox/repos/community-x86_64/PKGBUILD
(from rev 96486, openbox/trunk/PKGBUILD)
openbox/repos/community-x86_64/openbox-3.5.0-title-matching.patch
(from rev 96486, openbox/trunk/openbox-3.5.0-title-matching.patch)
openbox/repos/community-x86_64/openbox-3.5.0-which-2.20.patch
(from rev 96486, openbox/trunk/openbox-3.5.0-which-2.20.patch)
Deleted:
openbox/repos/community-i686/PKGBUILD
openbox/repos/community-i686/openbox-3.5.0-title-matching.patch
openbox/repos/community-i686/openbox-3.5.0-which-2.20.patch
openbox/repos/community-x86_64/PKGBUILD
openbox/repos/community-x86_64/openbox-3.5.0-title-matching.patch
openbox/repos/community-x86_64/openbox-3.5.0-which-2.20.patch
-----------------------------------------------------+
/PKGBUILD | 118 ++++++++++++++++++
/openbox-3.5.0-title-matching.patch | 22 +++
/openbox-3.5.0-which-2.20.patch | 22 +++
community-i686/PKGBUILD | 58 --------
community-i686/openbox-3.5.0-title-matching.patch | 11 -
community-i686/openbox-3.5.0-which-2.20.patch | 11 -
community-x86_64/PKGBUILD | 58 --------
community-x86_64/openbox-3.5.0-title-matching.patch | 11 -
community-x86_64/openbox-3.5.0-which-2.20.patch | 11 -
9 files changed, 162 insertions(+), 160 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-08-30 15:52:11 UTC (rev 96486)
+++ community-i686/PKGBUILD 2013-08-30 15:52:24 UTC (rev 96487)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: tobias <tobias at archlinux.org>
-
-pkgname=openbox
-pkgver=3.5.2
-pkgrel=1
-pkgdesc='Highly configurable and lightweight X11 window manager'
-arch=('i686' 'x86_64')
-url='http://openbox.org'
-license=('GPL')
-depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
- 'libxcursor' 'pango' 'imlib2')
-optdepends=('python2: for the xdg-autostart script'
- 'librsvg: for SVG icons support')
-groups=('lxde')
-options=('!libtool')
-backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml'
- 'etc/xdg/openbox/autostart' 'etc/xdg/openbox/environment')
-source=(http://www.icculus.org/openbox/releases/$pkgname-$pkgver.tar.gz
- openbox-3.5.0-title-matching.patch
- openbox-3.5.0-which-2.20.patch)
-md5sums=('93df606606053b7e8578a5c116afb8ec'
- '0a11d7149da210a31ef88f8a9c717711'
- '7ca3b5244bb092d46f5bcf1e2bdf4a18')
-
-prepare() {
- cd $pkgname-$pkgver
-
- patch -Np1 -i "$srcdir"/openbox-3.5.0-title-matching.patch # OB#5277
- patch -Np1 -i "$srcdir"/openbox-3.5.0-which-2.20.patch # FS#11455
-
- sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
- data/autostart/openbox-xdg-autostart
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --with-x \
- --enable-startup-notification \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/openbox
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- rm "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control}
-
- sed -i 's:startkde:/usr/bin/\0:' \
- "$pkgdir"/usr/share/xsessions/openbox-kde.desktop
- sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \
- "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop
-}
Copied: openbox/repos/community-i686/PKGBUILD (from rev 96486, openbox/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-08-30 15:52:24 UTC (rev 96487)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+
+pkgname=openbox
+pkgver=3.5.2
+pkgrel=2
+pkgdesc='Highly configurable and lightweight X11 window manager'
+arch=('i686' 'x86_64')
+url='http://openbox.org'
+license=('GPL')
+depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
+ 'libxcursor' 'pango' 'imlib2')
+makedepends=('librsvg')
+optdepends=('python2: for the xdg-autostart script'
+ 'librsvg: for SVG icons support')
+groups=('lxde')
+options=('!libtool')
+backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml'
+ 'etc/xdg/openbox/autostart' 'etc/xdg/openbox/environment')
+source=(http://www.icculus.org/openbox/releases/$pkgname-$pkgver.tar.gz
+ openbox-3.5.0-title-matching.patch
+ openbox-3.5.0-which-2.20.patch)
+md5sums=('93df606606053b7e8578a5c116afb8ec'
+ '0a11d7149da210a31ef88f8a9c717711'
+ '7ca3b5244bb092d46f5bcf1e2bdf4a18')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i "$srcdir"/openbox-3.5.0-title-matching.patch # OB#5277
+ patch -Np1 -i "$srcdir"/openbox-3.5.0-which-2.20.patch # FS#11455
+
+ sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+ data/autostart/openbox-xdg-autostart
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-x \
+ --enable-startup-notification \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/openbox
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ rm "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control}
+
+ sed -i 's:startkde:/usr/bin/\0:' \
+ "$pkgdir"/usr/share/xsessions/openbox-kde.desktop
+ sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \
+ "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop
+}
Deleted: community-i686/openbox-3.5.0-title-matching.patch
===================================================================
--- community-i686/openbox-3.5.0-title-matching.patch 2013-08-30 15:52:11 UTC (rev 96486)
+++ community-i686/openbox-3.5.0-title-matching.patch 2013-08-30 15:52:24 UTC (rev 96487)
@@ -1,11 +0,0 @@
---- openbox-3.5.0/openbox/client.c 2011-08-01 22:14:58.000000000 +0200
-+++ openbox-3.5.0/openbox/client.c 2011-10-22 14:59:56.000000000 +0200
-@@ -883,7 +883,7 @@
- !g_pattern_match(app->role,
- strlen(self->role), self->role, NULL))
- match = FALSE;
-- else if (app->title &&
-+ else if (app->title && self->title &&
- !g_pattern_match(app->title,
- strlen(self->title), self->title, NULL))
- match = FALSE;
Copied: openbox/repos/community-i686/openbox-3.5.0-title-matching.patch (from rev 96486, openbox/trunk/openbox-3.5.0-title-matching.patch)
===================================================================
--- community-i686/openbox-3.5.0-title-matching.patch (rev 0)
+++ community-i686/openbox-3.5.0-title-matching.patch 2013-08-30 15:52:24 UTC (rev 96487)
@@ -0,0 +1,11 @@
+--- openbox-3.5.0/openbox/client.c 2011-08-01 22:14:58.000000000 +0200
++++ openbox-3.5.0/openbox/client.c 2011-10-22 14:59:56.000000000 +0200
+@@ -883,7 +883,7 @@
+ !g_pattern_match(app->role,
+ strlen(self->role), self->role, NULL))
+ match = FALSE;
+- else if (app->title &&
++ else if (app->title && self->title &&
+ !g_pattern_match(app->title,
+ strlen(self->title), self->title, NULL))
+ match = FALSE;
Deleted: community-i686/openbox-3.5.0-which-2.20.patch
===================================================================
--- community-i686/openbox-3.5.0-which-2.20.patch 2013-08-30 15:52:11 UTC (rev 96486)
+++ community-i686/openbox-3.5.0-which-2.20.patch 2013-08-30 15:52:24 UTC (rev 96487)
@@ -1,11 +0,0 @@
---- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000
-+++ openbox-3.5.0/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000
-@@ -8,7 +8,7 @@
- #
- #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
- # @libexecdir@/gnome-settings-daemon &
--#elif which gnome-settings-daemon >/dev/null; then
-+#elif which gnome-settings-daemon >/dev/null 2>&1; then
- # gnome-settings-daemon &
- #fi
-
Copied: openbox/repos/community-i686/openbox-3.5.0-which-2.20.patch (from rev 96486, openbox/trunk/openbox-3.5.0-which-2.20.patch)
===================================================================
--- community-i686/openbox-3.5.0-which-2.20.patch (rev 0)
+++ community-i686/openbox-3.5.0-which-2.20.patch 2013-08-30 15:52:24 UTC (rev 96487)
@@ -0,0 +1,11 @@
+--- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000
++++ openbox-3.5.0/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000
+@@ -8,7 +8,7 @@
+ #
+ #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
+ # @libexecdir@/gnome-settings-daemon &
+-#elif which gnome-settings-daemon >/dev/null; then
++#elif which gnome-settings-daemon >/dev/null 2>&1; then
+ # gnome-settings-daemon &
+ #fi
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-08-30 15:52:11 UTC (rev 96486)
+++ community-x86_64/PKGBUILD 2013-08-30 15:52:24 UTC (rev 96487)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: tobias <tobias at archlinux.org>
-
-pkgname=openbox
-pkgver=3.5.2
-pkgrel=1
-pkgdesc='Highly configurable and lightweight X11 window manager'
-arch=('i686' 'x86_64')
-url='http://openbox.org'
-license=('GPL')
-depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
- 'libxcursor' 'pango' 'imlib2')
-optdepends=('python2: for the xdg-autostart script'
- 'librsvg: for SVG icons support')
-groups=('lxde')
-options=('!libtool')
-backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml'
- 'etc/xdg/openbox/autostart' 'etc/xdg/openbox/environment')
-source=(http://www.icculus.org/openbox/releases/$pkgname-$pkgver.tar.gz
- openbox-3.5.0-title-matching.patch
- openbox-3.5.0-which-2.20.patch)
-md5sums=('93df606606053b7e8578a5c116afb8ec'
- '0a11d7149da210a31ef88f8a9c717711'
- '7ca3b5244bb092d46f5bcf1e2bdf4a18')
-
-prepare() {
- cd $pkgname-$pkgver
-
- patch -Np1 -i "$srcdir"/openbox-3.5.0-title-matching.patch # OB#5277
- patch -Np1 -i "$srcdir"/openbox-3.5.0-which-2.20.patch # FS#11455
-
- sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
- data/autostart/openbox-xdg-autostart
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --with-x \
- --enable-startup-notification \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/openbox
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- rm "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control}
-
- sed -i 's:startkde:/usr/bin/\0:' \
- "$pkgdir"/usr/share/xsessions/openbox-kde.desktop
- sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \
- "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop
-}
Copied: openbox/repos/community-x86_64/PKGBUILD (from rev 96486, openbox/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-08-30 15:52:24 UTC (rev 96487)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+
+pkgname=openbox
+pkgver=3.5.2
+pkgrel=2
+pkgdesc='Highly configurable and lightweight X11 window manager'
+arch=('i686' 'x86_64')
+url='http://openbox.org'
+license=('GPL')
+depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
+ 'libxcursor' 'pango' 'imlib2')
+makedepends=('librsvg')
+optdepends=('python2: for the xdg-autostart script'
+ 'librsvg: for SVG icons support')
+groups=('lxde')
+options=('!libtool')
+backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml'
+ 'etc/xdg/openbox/autostart' 'etc/xdg/openbox/environment')
+source=(http://www.icculus.org/openbox/releases/$pkgname-$pkgver.tar.gz
+ openbox-3.5.0-title-matching.patch
+ openbox-3.5.0-which-2.20.patch)
+md5sums=('93df606606053b7e8578a5c116afb8ec'
+ '0a11d7149da210a31ef88f8a9c717711'
+ '7ca3b5244bb092d46f5bcf1e2bdf4a18')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i "$srcdir"/openbox-3.5.0-title-matching.patch # OB#5277
+ patch -Np1 -i "$srcdir"/openbox-3.5.0-which-2.20.patch # FS#11455
+
+ sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+ data/autostart/openbox-xdg-autostart
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-x \
+ --enable-startup-notification \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/openbox
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ rm "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control}
+
+ sed -i 's:startkde:/usr/bin/\0:' \
+ "$pkgdir"/usr/share/xsessions/openbox-kde.desktop
+ sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \
+ "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop
+}
Deleted: community-x86_64/openbox-3.5.0-title-matching.patch
===================================================================
--- community-x86_64/openbox-3.5.0-title-matching.patch 2013-08-30 15:52:11 UTC (rev 96486)
+++ community-x86_64/openbox-3.5.0-title-matching.patch 2013-08-30 15:52:24 UTC (rev 96487)
@@ -1,11 +0,0 @@
---- openbox-3.5.0/openbox/client.c 2011-08-01 22:14:58.000000000 +0200
-+++ openbox-3.5.0/openbox/client.c 2011-10-22 14:59:56.000000000 +0200
-@@ -883,7 +883,7 @@
- !g_pattern_match(app->role,
- strlen(self->role), self->role, NULL))
- match = FALSE;
-- else if (app->title &&
-+ else if (app->title && self->title &&
- !g_pattern_match(app->title,
- strlen(self->title), self->title, NULL))
- match = FALSE;
Copied: openbox/repos/community-x86_64/openbox-3.5.0-title-matching.patch (from rev 96486, openbox/trunk/openbox-3.5.0-title-matching.patch)
===================================================================
--- community-x86_64/openbox-3.5.0-title-matching.patch (rev 0)
+++ community-x86_64/openbox-3.5.0-title-matching.patch 2013-08-30 15:52:24 UTC (rev 96487)
@@ -0,0 +1,11 @@
+--- openbox-3.5.0/openbox/client.c 2011-08-01 22:14:58.000000000 +0200
++++ openbox-3.5.0/openbox/client.c 2011-10-22 14:59:56.000000000 +0200
+@@ -883,7 +883,7 @@
+ !g_pattern_match(app->role,
+ strlen(self->role), self->role, NULL))
+ match = FALSE;
+- else if (app->title &&
++ else if (app->title && self->title &&
+ !g_pattern_match(app->title,
+ strlen(self->title), self->title, NULL))
+ match = FALSE;
Deleted: community-x86_64/openbox-3.5.0-which-2.20.patch
===================================================================
--- community-x86_64/openbox-3.5.0-which-2.20.patch 2013-08-30 15:52:11 UTC (rev 96486)
+++ community-x86_64/openbox-3.5.0-which-2.20.patch 2013-08-30 15:52:24 UTC (rev 96487)
@@ -1,11 +0,0 @@
---- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000
-+++ openbox-3.5.0/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000
-@@ -8,7 +8,7 @@
- #
- #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
- # @libexecdir@/gnome-settings-daemon &
--#elif which gnome-settings-daemon >/dev/null; then
-+#elif which gnome-settings-daemon >/dev/null 2>&1; then
- # gnome-settings-daemon &
- #fi
-
Copied: openbox/repos/community-x86_64/openbox-3.5.0-which-2.20.patch (from rev 96486, openbox/trunk/openbox-3.5.0-which-2.20.patch)
===================================================================
--- community-x86_64/openbox-3.5.0-which-2.20.patch (rev 0)
+++ community-x86_64/openbox-3.5.0-which-2.20.patch 2013-08-30 15:52:24 UTC (rev 96487)
@@ -0,0 +1,11 @@
+--- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000
++++ openbox-3.5.0/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000
+@@ -8,7 +8,7 @@
+ #
+ #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
+ # @libexecdir@/gnome-settings-daemon &
+-#elif which gnome-settings-daemon >/dev/null; then
++#elif which gnome-settings-daemon >/dev/null 2>&1; then
+ # gnome-settings-daemon &
+ #fi
+
More information about the arch-commits
mailing list