[arch-commits] Commit in trayer/trunk (PKGBUILD manpage.diff)

[Eric Bélanger]

    Date: Tuesday, May 29, 2012 @ 23:39:09
  Author: eric
Revision: 160178

upgpkg: trayer 1.0-7

Remove invalid --distancefrom option from man page (close FS#30069), Add build fix

Modified:
  trayer/trunk/PKGBUILD
  trayer/trunk/manpage.diff

--------------+
 PKGBUILD     |   10 +++++-----
 manpage.diff |    9 +--------
 2 files changed, 6 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-29 23:15:42 UTC (rev 160177)
+++ PKGBUILD	2012-05-30 03:39:09 UTC (rev 160178)
@@ -3,7 +3,7 @@
 
 pkgname=trayer
 pkgver=1.0
-pkgrel=6
+pkgrel=7
 pkgdesc="A lightweight GTK2-based systray"
 arch=('i686' 'x86_64')
 url="https://gna.org/projects/fvwm-crystal/"
@@ -13,15 +13,15 @@
 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}"
 }
 

Modified: manpage.diff
===================================================================
--- manpage.diff	2012-05-29 23:15:42 UTC (rev 160177)
+++ manpage.diff	2012-05-30 03:39:09 UTC (rev 160178)
@@ -4,7 +4,7 @@
 ===================================================================
 --- /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 @@
 +.RB [\| \-\-distance
 +.RI \| <length> \|]
 +.\"
-+.RB [\| \-\-distancefrom
-+.RI \| left \||\| right \||\| top \||\| bottom \||\| none \|]
-+.\"
 +.RB [\| \-\-expand
 +.RI \| true \||\| false \|]
 +.\"
@@ -176,10 +173,6 @@
 +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.