diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-09-03 16:10:12 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-09-03 16:10:12 -0300 |
| commit | 037bcb846a6662420bd0f5d1edaad58bda4c86a7 (patch) | |
| tree | 82494884d013c7b2cc9cd5df16c54cae0712d472 /community/openbox/PKGBUILD | |
| parent | 830afd54d0d990fdb982292bed4c97f577dc195d (diff) | |
| parent | 3aa73e2018f321c9ccff8eca801b1c2fa9f18fa8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/darkhttpd/PKGBUILD
community/gnome-panel/PKGBUILD
community/gpicview/PKGBUILD
community/iftop/PKGBUILD
community/lazarus/PKGBUILD
community/netsurf/PKGBUILD
community/polkit-gnome/PKGBUILD
community/texvc/PKGBUILD
community/unbound/PKGBUILD
community/xfmedia/PKGBUILD
core/glibc/PKGBUILD
extra/arora/PKGBUILD
extra/cairo/PKGBUILD
extra/graphviz/PKGBUILD
extra/libmng/PKGBUILD
extra/mesa/PKGBUILD
extra/nx/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/sqlite/PKGBUILD
libre/midori-libre/PKGBUILD
~fauno/distccd-zeroconf/PKGBUILD
~fauno/kyotocabinet/PKGBUILD
~fauno/kyototycoon/PKGBUILD
Diffstat (limited to 'community/openbox/PKGBUILD')
| -rw-r--r-- | community/openbox/PKGBUILD | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD index fa508a781..caae00e5f 100644 --- a/community/openbox/PKGBUILD +++ b/community/openbox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95420 2013-08-12 05:12:07Z bpiotrowski $ +# $Id: PKGBUILD 96638 2013-09-02 18:32:53Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,25 +6,28 @@ pkgname=openbox pkgver=3.5.2 -pkgrel=1 +pkgrel=4 pkgdesc='Highly configurable and lightweight X11 window manager' arch=('i686' 'x86_64' 'mips64el') 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') + 'libxcursor' 'pango' 'imlib2' 'librsvg') +optdepends=('gnome-flashback-session: for the GNOME/Openbox xsession' + 'kdebase-workspace: for the KDE/Openbox xsession' + 'python2-xdg: for the openbox-xdg-autostart script') 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) + openbox-3.5.0-which-2.20.patch + openbox-3.5.0-gnome-session.patch) md5sums=('93df606606053b7e8578a5c116afb8ec' '0a11d7149da210a31ef88f8a9c717711' - '7ca3b5244bb092d46f5bcf1e2bdf4a18') + '7ca3b5244bb092d46f5bcf1e2bdf4a18' + '47fb1a16af05b6aba3b07051e6027f93') prepare() { cd $pkgname-$pkgver @@ -32,6 +35,9 @@ prepare() { 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 + # Fix GNOME/Openbox xsession with GNOME 3.8 + patch -Np1 -i "$srcdir"/openbox-3.5.0-gnome-session.patch + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ data/autostart/openbox-xdg-autostart } @@ -49,7 +55,9 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - rm "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control} + + rm "$pkgdir"/usr/bin/gdm-control \ + "$pkgdir"/usr/share/gnome-session/sessions/openbox-gnome-fallback.session sed -i 's:startkde:/usr/bin/\0:' \ "$pkgdir"/usr/share/xsessions/openbox-kde.desktop |