diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-12 17:51:32 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-12 17:51:32 -0300 |
| commit | 8878de8508ef59fe63f2d19a258a383ba09b10a8 (patch) | |
| tree | 9c5bf862464d4d4c2dae393189065a2615fa260e /community/lxpanel | |
| parent | 0fccb862cc0ea09fc8a76c29babfdcef823d9ab7 (diff) | |
| parent | 0d51c533d75a26daabeb9e7b9c5dcfb211498a4d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libfm/PKGBUILD
community/lxlauncher/PKGBUILD
community/mrtg/PKGBUILD
core/glib2/PKGBUILD
extra/epiphany/PKGBUILD
extra/m17n-lib/PKGBUILD
extra/mtr/PKGBUILD
Diffstat (limited to 'community/lxpanel')
| -rw-r--r-- | community/lxpanel/PKGBUILD | 22 | ||||
| -rw-r--r-- | community/lxpanel/lxpanel-0.5.12-automake-1.14-support.patch (renamed from community/lxpanel/lxpanel-0.5.12-automake-1.13-support.patch) | 2 |
2 files changed, 13 insertions, 11 deletions
diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD index 4e413ff82..1610bd8c6 100644 --- a/community/lxpanel/PKGBUILD +++ b/community/lxpanel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83070 2013-01-27 10:16:43Z bpiotrowski $ +# $Id: PKGBUILD 93770 2013-07-10 07:14:37Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxpanel pkgver=0.5.12 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight X11 desktop panel for LXDE' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -15,16 +15,18 @@ depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data' 'libwnck') makedepends=('docbook-xml' 'docbook-xsl' 'wireless_tools') optdepends=('wireless_tools: netstat plugin') source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz - lxpanel-0.5.12-automake-1.13-support.patch) + lxpanel-0.5.12-automake-1.14-support.patch) sha256sums=('c29997c522f138e4beb02fc549c84136fc840a836c1f69b400d90d2d4e91de1b' - 'a35c786e3cd2977c5cf018e126c7f309b7fc4c15f9b821895e1f6fe25125f68f') + 'ce5bf608374188da00ce3f0a1c74d1ddebd160555db4119eebd85f64731fe1d1') -build() { - cd $srcdir/$pkgname-$pkgver - - patch -Np0 -i $srcdir/lxpanel-0.5.12-automake-1.13-support.patch +prepare() { + cd $pkgname-$pkgver + patch -Np0 -i ../lxpanel-0.5.12-automake-1.14-support.patch ./autogen.sh +} +build() { + cd $pkgname-$pkgver CFLAGS+=' -lgmodule-2.0' ./configure \ --sysconfdir=/etc \ --prefix=/usr \ @@ -33,6 +35,6 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/lxpanel/lxpanel-0.5.12-automake-1.13-support.patch b/community/lxpanel/lxpanel-0.5.12-automake-1.14-support.patch index 25916bbf6..3b40931de 100644 --- a/community/lxpanel/lxpanel-0.5.12-automake-1.13-support.patch +++ b/community/lxpanel/lxpanel-0.5.12-automake-1.14-support.patch @@ -6,7 +6,7 @@ -a "$AM_INSTALLED_VERSION" != "1.11" \ - -a "$AM_INSTALLED_VERSION" != "1.12" ];then + -a "$AM_INSTALLED_VERSION" != "1.12" \ -+ -a "$AM_INSTALLED_VERSION" != "1.13" ];then ++ -a "$AM_INSTALLED_VERSION" != "1.14" ];then echo - echo "You must have automake 1.10, 1.11, or 1.12 installed to compile lxpanel." + echo "You must have automake >=1.10 installed to compile lxpanel." |