diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
| commit | d07d53d7af1e9694d9558783841bc2df3124a90f (patch) | |
| tree | 40d68de204b29d3360efd654d3c458c9cdad3cd6 /community/openbox/PKGBUILD | |
| parent | a873bdc69d24650d832933463af71dfaa96f1a8a (diff) | |
| parent | 64e290184042563a240e2d6d15c02e06703d00ee (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/obconf/PKGBUILD
community/obconf/obconf.install
community/qstardict/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
extra/cups/PKGBUILD
extra/eject/PKGBUILD
extra/emacs/PKGBUILD
extra/evilwm/PKGBUILD
extra/fbset/PKGBUILD
extra/gmpc/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gtkpod/PKGBUILD
extra/kdepim/PKGBUILD
extra/kile/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/potrace/PKGBUILD
extra/racket/PKGBUILD
extra/soundtouch/PKGBUILD
extra/wireshark/PKGBUILD
extra/xpdf/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'community/openbox/PKGBUILD')
| -rw-r--r-- | community/openbox/PKGBUILD | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD index 85f3a34d6..d08978805 100644 --- a/community/openbox/PKGBUILD +++ b/community/openbox/PKGBUILD @@ -1,47 +1,50 @@ -# $Id: PKGBUILD 49029 2011-06-09 21:05:36Z andrea $ +# $Id: PKGBUILD 54399 2011-08-18 05:37:17Z bfanella $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: tobias <tobias@archlinux.org> pkgname=openbox -pkgver=3.4.11.2 -pkgrel=2 +pkgver=3.5.0 +pkgrel=3 pkgdesc="A window manager for the X11 windowing system" arch=('i686' 'x86_64' 'mips64el') url="http://openbox.org" license=('GPL') depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr' - 'libxcursor' 'pango') + 'libxcursor' 'pango' 'imlib2') optdepends=('pyxdg: for the xdg-autostart script') groups=('lxde') install=${pkgname}.install options=('!libtool') backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml') -source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz +source=("http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz" 'which-2.20.patch') -md5sums=('30e669134fa81df810fe7d1dc59cd931' - 'ec5e3d4d74779b0ca576a053ae54124d') +md5sums=('00441b53cf14c03566c8e82643544ff9' + '7ca3b5244bb092d46f5bcf1e2bdf4a18') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} - # FS#11455 - patch -Np1 -i ${srcdir}/which-2.20.patch - sed -i 's#python#python2#' tools/xdg-autostart/xdg-autostart - ./configure --prefix=/usr \ - --with-x \ - --enable-startup-notification \ - --sysconfdir=/etc - make + # FS#11455 + patch -p1 -i "${srcdir}"/which-2.20.patch + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + data/autostart/openbox-xdg-autostart + + ./configure --prefix=/usr \ + --with-x \ + --enable-startup-notification \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/openbox + + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install - make DESTDIR=${pkgdir} install - - 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 + 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 } |