diff options
| author |   Marinus Schraal <foser@gentoo.org> | 2004-09-30 15:44:17 +0000 |
|---|---|---|
| committer | Marinus Schraal <foser@gentoo.org> | 2004-09-30 15:44:17 +0000 |
| commit | 7b9ab6a42d4568e278491f0fc735c76c6114cd20 (patch) | |
| tree | 211cbeec61f44ed2d35981983211e65c4167e5e7 /gnome-base | |
| parent | clean up virtuals (diff) | |
| download | gentoo-2-7b9ab6a42d4568e278491f0fc735c76c6114cd20.tar.gz gentoo-2-7b9ab6a42d4568e278491f0fc735c76c6114cd20.tar.bz2 gentoo-2-7b9ab6a42d4568e278491f0fc735c76c6114cd20.zip | |
make the patch somewhat simpler
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-howl_config.patch | 59 | ||||
| -rw-r--r-- | gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild | 3 |
2 files changed, 1 insertions, 61 deletions
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-howl_config.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-howl_config.patch index 022c727a341f..8d2debd2a795 100644 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-howl_config.patch +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-howl_config.patch @@ -24,62 +24,3 @@ diff -aurN gnome-vfs-2.8.1-orig/configure.in gnome-vfs-2.8.1/configure.in dnl **************************** dnl HAL stuff -diff -aurN gnome-vfs-2.8.1-orig/modules/Makefile.am gnome-vfs-2.8.1/modules/Makefile.am ---- gnome-vfs-2.8.1-orig/modules/Makefile.am 2004-09-14 12:24:15.000000000 -0400 -+++ gnome-vfs-2.8.1/modules/Makefile.am 2004-09-21 17:48:34.137579728 -0400 -@@ -50,6 +50,11 @@ - SMB_LTLIBS = - endif - -+if HAVE_HOWL -+HOWL_LTLIBS = libdns-sd.la -+else -+HOWL_LTLIBS = -+endif - - if BUILD_CDEMENU_MODULE - CDEMENU_LTLIBS = libcdemenu-desktop.la -@@ -63,7 +68,7 @@ - modules_LTLIBRARIES = \ - $(CDDA_LTLIBS) \ - libcomputer.la \ -- libdns-sd.la \ -+ $(HOWL_LTLIBS) \ - libfile.la \ - libnetwork.la \ - libnntp.la \ -@@ -90,13 +95,16 @@ - if HAVE_SAMBA - SMB_CONF = smb-module.conf - endif -+if HAVE_HOWL -+HOWL_CONF = dns-sd-module.conf -+endif - if HAVE_SSL - SSL_CONF = ssl-modules.conf - endif - if BUILD_CDEMENU_MODULE - CDE_CONF = cdemenu-module.conf - endif --modulesconf_DATA = default-modules.conf $(CDDA_CONF) $(SMB_CONF) $(SSL_CONF) $(CDE_CONF) -+modulesconf_DATA = default-modules.conf $(CDDA_CONF) $(SMB_CONF) $(HOWL_CONF) $(SSL_CONF) $(CDE_CONF) - - ### `cdda' method - -diff -aurN gnome-vfs-2.8.1-orig/modules/default-modules.conf gnome-vfs-2.8.1/modules/default-modules.conf ---- gnome-vfs-2.8.1-orig/modules/default-modules.conf 2004-08-13 02:52:12.000000000 -0400 -+++ gnome-vfs-2.8.1/modules/default-modules.conf 2004-09-21 17:49:12.957678176 -0400 -@@ -12,8 +12,6 @@ - - computer: computer - --dns-sd: dns-sd -- - file: file - - test: vfs-test -diff -aurN gnome-vfs-2.8.1-orig/modules/dns-sd-module.conf gnome-vfs-2.8.1/modules/dns-sd-module.conf ---- gnome-vfs-2.8.1-orig/modules/dns-sd-module.conf 1969-12-31 19:00:00.000000000 -0500 -+++ gnome-vfs-2.8.1/modules/dns-sd-module.conf 2004-09-21 17:48:34.138579576 -0400 -@@ -0,0 +1 @@ -+dns-sd: dns-sd diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild index 0d4b391c6ae0..3f81ae62d039 100644 --- a/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild +++ b/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild,v 1.1 2004/09/30 15:12:42 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild,v 1.2 2004/09/30 15:44:17 foser Exp $ inherit gnome2 eutils @@ -70,7 +70,6 @@ src_unpack() { # make howl a real switch (#64906) epatch ${FILESDIR}/${P}-howl_config.patch - automake autoconf } |