summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Shakaryan <omp@gentoo.org>2007-08-08 10:08:17 +0000
committerDavid Shakaryan <omp@gentoo.org>2007-08-08 10:08:17 +0000
commit55db30d5eb2eb5d87e446bf3b202b2ce6fba5cf5 (patch)
tree1d17e3bb7efe996fd8308cadc63e83ed83e18369 /x11-misc/peksystray
parentversion bump (diff)
downloadgentoo-2-55db30d5eb2eb5d87e446bf3b202b2ce6fba5cf5.tar.gz
gentoo-2-55db30d5eb2eb5d87e446bf3b202b2ce6fba5cf5.tar.bz2
gentoo-2-55db30d5eb2eb5d87e446bf3b202b2ce6fba5cf5.zip
Fix AMD64 compile bug; thanks to Kenneth Prugh for patch. (bug #186504)
(Portage version: 2.1.3.3)
Diffstat (limited to 'x11-misc/peksystray')
-rw-r--r--x11-misc/peksystray/ChangeLog6
-rw-r--r--x11-misc/peksystray/files/peksystray-0.4.0-ldadd.patch30
-rw-r--r--x11-misc/peksystray/peksystray-0.4.0.ebuild11
3 files changed, 45 insertions, 2 deletions
diff --git a/x11-misc/peksystray/ChangeLog b/x11-misc/peksystray/ChangeLog
index d955334f4c01..f260557f85ec 100644
--- a/x11-misc/peksystray/ChangeLog
+++ b/x11-misc/peksystray/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/peksystray
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/ChangeLog,v 1.17 2007/07/24 00:46:55 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/ChangeLog,v 1.18 2007/08/08 10:08:17 omp Exp $
+
+ 08 Aug 2007; David Shakaryan <omp@gentoo.org>
+ +files/peksystray-0.4.0-ldadd.patch, peksystray-0.4.0.ebuild:
+ Fix AMD64 compile bug; thanks to Kenneth Prugh for patch. (bug #186504)
*peksystray-0.4.0 (24 Jul 2007)
diff --git a/x11-misc/peksystray/files/peksystray-0.4.0-ldadd.patch b/x11-misc/peksystray/files/peksystray-0.4.0-ldadd.patch
new file mode 100644
index 000000000000..4f867d36fe1d
--- /dev/null
+++ b/x11-misc/peksystray/files/peksystray-0.4.0-ldadd.patch
@@ -0,0 +1,30 @@
+diff -u -Nr peksystray-0.4.0.orig/src/Makefile.am peksystray-0.4.0/src/Makefile.am
+--- peksystray-0.4.0.orig/src/Makefile.am 2003-06-13 22:06:23.000000000 -0400
++++ peksystray-0.4.0/src/Makefile.am 2007-08-05 15:06:47.000000000 -0400
+@@ -2,6 +2,4 @@
+
+ INCLUDES = @x_includes@
+
+-peksystray_LDADD = @x_libraries@
+-
+ peksystray_SOURCES = peksystray.c
+diff -u -Nr peksystray-0.4.0.orig/src/Makefile.in peksystray-0.4.0/src/Makefile.in
+--- peksystray-0.4.0.orig/src/Makefile.in 2007-01-05 18:16:38.000000000 -0500
++++ peksystray-0.4.0/src/Makefile.in 2007-08-05 15:07:02.000000000 -0400
+@@ -146,7 +146,6 @@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ INCLUDES = @x_includes@
+-peksystray_LDADD = @x_libraries@
+ peksystray_SOURCES = peksystray.c
+ all: all-am
+
+@@ -206,7 +205,7 @@
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ peksystray$(EXEEXT): $(peksystray_OBJECTS) $(peksystray_DEPENDENCIES)
+ @rm -f peksystray$(EXEEXT)
+- $(LINK) $(peksystray_LDFLAGS) $(peksystray_OBJECTS) $(peksystray_LDADD) $(LIBS)
++ $(LINK) $(peksystray_LDFLAGS) $(peksystray_OBJECTS) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
diff --git a/x11-misc/peksystray/peksystray-0.4.0.ebuild b/x11-misc/peksystray/peksystray-0.4.0.ebuild
index 7b5b58c08b6d..d40454f787a4 100644
--- a/x11-misc/peksystray/peksystray-0.4.0.ebuild
+++ b/x11-misc/peksystray/peksystray-0.4.0.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/peksystray-0.4.0.ebuild,v 1.1 2007/07/24 00:46:55 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/peksystray-0.4.0.ebuild,v 1.2 2007/08/08 10:08:17 omp Exp $
+
+inherit eutils
DESCRIPTION="A system tray dockapp for window managers supporting docking"
HOMEPAGE="http://peksystray.sourceforge.net/"
@@ -15,6 +17,13 @@ RDEPEND="x11-libs/libX11
x11-libs/libXt"
DEPEND="${RDEPEND}"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}/${P}-ldadd.patch"
+}
+
src_install() {
dobin src/peksystray
dodoc AUTHORS ChangeLog NEWS README REFS THANKS TODO