summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-07-13 21:21:34 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-07-13 21:21:34 +0000
commit72b1b4d1386c52411b844fb4ee1162e32b42f84a (patch)
tree5e1fb2f30ea7a6e0a8db3925e9e03ee634c4c964 /xfce-base
parentApplied as-needed patch, as supplied by drac. (diff)
downloadgentoo-2-72b1b4d1386c52411b844fb4ee1162e32b42f84a.tar.gz
gentoo-2-72b1b4d1386c52411b844fb4ee1162e32b42f84a.tar.bz2
gentoo-2-72b1b4d1386c52411b844fb4ee1162e32b42f84a.zip
Applied as-needed patch, as supplied by drac.
(Portage version: 2.1.1_pre2-r4)
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/xfce4-panel/ChangeLog6
-rw-r--r--xfce-base/xfce4-panel/files/xfce4-panel-4.3.90.2-asneeded.patch12
-rw-r--r--xfce-base/xfce4-panel/xfce4-panel-4.3.90.2.ebuild10
3 files changed, 25 insertions, 3 deletions
diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index e8d3a2afa933..fe57b2ccf767 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-base/xfce4-panel
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.69 2006/07/13 19:17:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.70 2006/07/13 21:21:34 nichoj Exp $
+
+ 13 Jul 2006; Joshua Nichols <jnichols@gentoo.org>
+ +files/xfce4-panel-4.3.90.2-asneeded.patch, xfce4-panel-4.3.90.2.ebuild:
+ Applied as-needed patch, as supplied by drac.
13 Jul 2006; Aron Griffis <agriffis@gentoo.org> xfce4-panel-4.2.3.ebuild:
Mark 4.2.3 stable on ia64
diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.3.90.2-asneeded.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.3.90.2-asneeded.patch
new file mode 100644
index 000000000000..cf098d82a1d3
--- /dev/null
+++ b/xfce-base/xfce4-panel/files/xfce4-panel-4.3.90.2-asneeded.patch
@@ -0,0 +1,12 @@
+diff -ur xfce4-panel-4.3.90.2.orig/libxfce4panel/Makefile.in xfce4-panel-4.3.90.2/libxfce4panel/Makefile.in
+--- xfce4-panel-4.3.90.2.orig/libxfce4panel/Makefile.in 2006-07-10 15:03:57.000000000 +0300
++++ xfce4-panel-4.3.90.2/libxfce4panel/Makefile.in 2006-07-12 23:00:20.000000000 +0300
+@@ -91,7 +91,7 @@
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++ $(AM_LDFLAGS) $(LDFLAGS) -lxfcegui4 -o $@
+ SOURCES = $(libxfce4panel_la_SOURCES)
+ DIST_SOURCES = $(libxfce4panel_la_SOURCES)
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.3.90.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.3.90.2.ebuild
index 22b18c7ffe2c..1be5a8cd6b9e 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.3.90.2.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.3.90.2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.3.90.2.ebuild,v 1.2 2006/07/10 18:54:07 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.3.90.2.ebuild,v 1.3 2006/07/13 21:21:34 nichoj Exp $
-inherit xfce44
+inherit xfce44 eutils
xfce44_beta
@@ -47,3 +47,9 @@ RDEPEND="|| ( ( x11-libs/libX11
XFCE_CONFIG="$(use_enable startup-notification)"
xfce44_core_package
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${P}-asneeded.patch
+}