diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-09-12 20:11:06 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-09-12 20:11:06 +0000 |
| commit | 6508732a57bc0ef5ad4a0d32344440fd59edd882 (patch) | |
| tree | 76803d27df642a2898c81cc2066e11cbeec3c624 /sys-fs | |
| parent | remove old, fix xinitrc.d thanks Markus Lohse <mlohse@gmx.net>, bug 143925 (diff) | |
| download | gentoo-2-6508732a57bc0ef5ad4a0d32344440fd59edd882.tar.gz gentoo-2-6508732a57bc0ef5ad4a0d32344440fd59edd882.tar.bz2 gentoo-2-6508732a57bc0ef5ad4a0d32344440fd59edd882.zip | |
fix popt linking thanks to David Li <matrixhax0r@gmail.com> in bug 147332
(Portage version: 2.1.1)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/captive/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/captive/captive-1.1.7-r1.ebuild | 3 | ||||
| -rw-r--r-- | sys-fs/captive/files/captive-popt.diff | 33 |
3 files changed, 40 insertions, 2 deletions
diff --git a/sys-fs/captive/ChangeLog b/sys-fs/captive/ChangeLog index 8488e8557215..9e0b184c1131 100644 --- a/sys-fs/captive/ChangeLog +++ b/sys-fs/captive/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/captive # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/ChangeLog,v 1.17 2006/08/12 22:58:10 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/ChangeLog,v 1.18 2006/09/12 20:11:06 genstef Exp $ + + 12 Sep 2006; Stefan Schweizer <genstef@gentoo.org> + +files/captive-popt.diff, captive-1.1.7-r1.ebuild: + fix popt linking thanks to David Li <matrixhax0r@gmail.com> in bug 147332 12 Aug 2006; Stefan Schweizer <genstef@gentoo.org> +files/captive-fuse-2.6.0_pre3.patch, captive-1.1.7-r1.ebuild: diff --git a/sys-fs/captive/captive-1.1.7-r1.ebuild b/sys-fs/captive/captive-1.1.7-r1.ebuild index 9f171d9829b0..f0053e544389 100644 --- a/sys-fs/captive/captive-1.1.7-r1.ebuild +++ b/sys-fs/captive/captive-1.1.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/captive-1.1.7-r1.ebuild,v 1.6 2006/08/12 22:58:10 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/captive-1.1.7-r1.ebuild,v 1.7 2006/09/12 20:11:06 genstef Exp $ inherit eutils @@ -49,6 +49,7 @@ src_unpack() { if has_version '>=sys-fs/fuse-2.6.0_pre3'; then epatch ${FILESDIR}/captive-fuse-2.6.0_pre3.patch fi + epatch ${FILESDIR}/captive-popt.diff } src_compile() { diff --git a/sys-fs/captive/files/captive-popt.diff b/sys-fs/captive/files/captive-popt.diff new file mode 100644 index 000000000000..05e8fa0096e5 --- /dev/null +++ b/sys-fs/captive/files/captive-popt.diff @@ -0,0 +1,33 @@ +--- captive-1.1.7/src/client/cmdline/Makefile.in 2006-01-26 16:20:40.000000000 -0500 ++++ captive-1.1.7/src/client/cmdline/Makefile.in 2006-09-12 10:44:22.110968408 -0400 +@@ -459,7 +459,7 @@ + utf8.h + + captive_cmdline_CFLAGS = $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) +-captive_cmdline_LDADD = $(captive_library) $(GNOME_VFS_LIBS) $(LIBXML_LIBS) $(READLINE_LIBS) $(INTLLIBS) ++captive_cmdline_LDADD = $(captive_library) $(GNOME_VFS_LIBS) $(LIBXML_LIBS) $(READLINE_LIBS) $(INTLLIBS) $(POPT_LIBS) + captive_cmdline_LDFLAGS = $(READLINE_LDFLAGS) + @ENABLE_MAN_PAGES_TRUE@captive_cmdline_man_cond = captive-cmdline.1 + man_MANS = $(captive_cmdline_man_cond) +--- captive-1.1.7/src/client/sandbox-server/Makefile.in 2006-01-26 16:20:43.000000000 -0500 ++++ captive-1.1.7/src/client/sandbox-server/Makefile.in 2006-09-12 10:50:15.509243704 -0400 +@@ -401,7 +401,7 @@ + main.c + + captive_sandbox_server_CFLAGS = $(ORBIT_CFLAGS) $(LINC_CFLAGS) $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) +-captive_sandbox_server_LDADD = $(ORBIT_LIBS) $(LINC_LIBS) $(GNOME_VFS_LIBS) $(LIBXML_LIBS) $(captive_library) $(INTLLIBS) ++captive_sandbox_server_LDADD = $(ORBIT_LIBS) $(LINC_LIBS) $(GNOME_VFS_LIBS) $(LIBXML_LIBS) $(captive_library) $(INTLLIBS) $(POPT_LIBS) + @ENABLE_MAN_PAGES_TRUE@captive_sandbox_server_man_cond = captive-sandbox-server.1 + man_MANS = $(captive_sandbox_server_man_cond) + all: $(BUILT_SOURCES) +--- captive-1.1.7/src/client/fuse/Makefile.in 2006-01-26 16:20:41.000000000 -0500 ++++ captive-1.1.7/src/client/fuse/Makefile.in 2006-09-12 10:55:57.854199360 -0400 +@@ -505,7 +505,7 @@ + mount_captive_CFLAGS = $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) \ + $(FUSE_CFLAGS) -DLIBEXECDIR="$(libexecdir)" \ + -DVARLIBCAPTIVEDIR="$(localstatedir)/lib/$(PACKAGE)" +-mount_captive_LDADD = $(captive_library) $(GNOME_VFS_LIBS) $(LIBXML_LIBS) $(FUSE_LIBS) $(INTLLIBS) ++mount_captive_LDADD = $(captive_library) $(GNOME_VFS_LIBS) $(LIBXML_LIBS) $(FUSE_LIBS) $(INTLLIBS) $(POPT_LIBS) + mount_captive_LDFLAGS = $(READLINE_LDFLAGS) + @ENABLE_FUSE_TRUE@@ENABLE_SBIN_MOUNT_TRUE@mount_captive_cond = mount.captive + @ENABLE_FUSE_TRUE@@ENABLE_SBIN_MOUNT_TRUE@initd_SCRIPTS_cond = captive |