diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
| commit | ca4b95e91b33e5b8f02a063862359ab00c5260d5 (patch) | |
| tree | 872d6a54fa0e59e017aa3101880d82f0e54fb70a /extra/trayer | |
| parent | 041ebdb9062909e39f81cca8c491c7f8adeed2a3 (diff) | |
| parent | 2ed96c6eb798c762b61a93a8b4cf80220c00ac1f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/libvirt/PKGBUILD
community/opendkim/opendkim.rc
core/nfs-utils/blkmapd.service
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-qt/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to 'extra/trayer')
| -rw-r--r-- | extra/trayer/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/trayer/manpage.diff | 9 |
2 files changed, 7 insertions, 14 deletions
diff --git a/extra/trayer/PKGBUILD b/extra/trayer/PKGBUILD index 6f5de6602..d9a8e1259 100644 --- a/extra/trayer/PKGBUILD +++ b/extra/trayer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138436 2011-09-23 04:20:09Z eric $ +# $Id: PKGBUILD 160179 2012-05-30 03:39:36Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=trayer pkgver=1.0 -pkgrel=6 +pkgrel=7 pkgdesc="A lightweight GTK2-based systray" arch=('i686' 'x86_64' 'mips64el') url="https://gna.org/projects/fvwm-crystal/" @@ -13,15 +13,15 @@ makedepends=('libxmu') options=('!makeflags') source=(http://download.gna.org/fvwm-crystal/trayer/${pkgver}/${pkgname}-${pkgver}.tar.gz trayer.diff manpage.diff) -md5sums=('e1b0b6464f991f2c296561e377585867' - '7f66eee885563871f9f76646bca6b14d' - '3f1c92bbe275f186b613c04a47e8e977') +sha1sums=('f2657693d196578e3776b0812952dfa1c25878cc' + '63459c5f74b8cc137d8a16ab997200025225215c' + 'eb919fd4a6223034e59e7c9fd0de298d40c91242') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p0 -i ../trayer.diff patch -p1 -i ../manpage.diff - sed -i 's/$(LIBS) $(OBJ) $(SYSTRAYOBJ)/$(OBJ) $(SYSTRAYOBJ) $(LIBS)/' Makefile + sed -i 's/$(LIBS) $(OBJ) $(SYSTRAYOBJ)/$(OBJ) $(SYSTRAYOBJ) $(LIBS) -lX11/' Makefile make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } diff --git a/extra/trayer/manpage.diff b/extra/trayer/manpage.diff index c99fc71af..f4ea9394e 100644 --- a/extra/trayer/manpage.diff +++ b/extra/trayer/manpage.diff @@ -4,7 +4,7 @@ Index: trayer/trayer.1 =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ trayer/trayer.1 2011-05-08 21:38:37.000000000 +0200 -@@ -0,0 +1,197 @@ +@@ -0,0 +1,190 @@ +.TH TRAYER 1 "Feb 14, 2005" "FVWM\-Crystal" +.SH NAME +trayer \- a lightweight GTK2\-based systray for UNIX desktop @@ -55,9 +55,6 @@ Index: trayer/trayer.1 +.RB [\| \-\-distance +.RI \| <length> \|] +.\" -+.RB [\| \-\-distancefrom -+.RI \| left \||\| right \||\| top \||\| bottom \||\| none \|] -+.\" +.RB [\| \-\-expand +.RI \| true \||\| false \|] +.\" @@ -176,10 +173,6 @@ Index: trayer/trayer.1 +Specifies distance between trayer's window and screen edge (in pixels) + +.TP -+\fB\-\-distancefrom\fP \fI<edge>\fP -+Specifies which edge to calculate distance from, see above. -+ -+.TP +\fB\-\-expand\fP \fItrue\fP\||\|\fIfalse\fP +Specifies whether trayer may accommodate extra space when there is too much +icons. |