diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2009-03-22 10:41:39 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2009-03-22 10:41:39 +0000 |
| commit | 2e2136635a44d36729e35accb0eed17ee93adf03 (patch) | |
| tree | accd3e20562cd25cf2fe748b70bd8f111803c303 /sys-fs/siefs/files | |
| parent | fix bug #260008 (new makefile!) (diff) | |
| download | gentoo-2-2e2136635a44d36729e35accb0eed17ee93adf03.tar.gz gentoo-2-2e2136635a44d36729e35accb0eed17ee93adf03.tar.bz2 gentoo-2-2e2136635a44d36729e35accb0eed17ee93adf03.zip | |
Fix collision with app-mobilephone/vmoconv (#256570).
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/siefs/files')
| -rw-r--r-- | sys-fs/siefs/files/siefs-0.5-external-vmoconv.patch | 12 | ||||
| -rw-r--r-- | sys-fs/siefs/files/siefs-0.5-qa-fixes.patch | 15 |
2 files changed, 27 insertions, 0 deletions
diff --git a/sys-fs/siefs/files/siefs-0.5-external-vmoconv.patch b/sys-fs/siefs/files/siefs-0.5-external-vmoconv.patch new file mode 100644 index 000000000000..cb9688e24979 --- /dev/null +++ b/sys-fs/siefs/files/siefs-0.5-external-vmoconv.patch @@ -0,0 +1,12 @@ +diff -Nru siefs-0.5.orig/configure.in siefs-0.5/configure.in +--- siefs-0.5.orig/configure.in 2005-04-04 05:15:31.000000000 +0000 ++++ siefs-0.5/configure.in 2009-03-03 20:55:08.000000000 +0000 +@@ -50,7 +50,7 @@ + AC_MSG_RESULT(${fuseinst}) + AC_SUBST(fuseinst) + +-subdirs="siefs converter" ++subdirs="siefs" + AC_SUBST(subdirs) + + AC_DEFINE_UNQUOTED(FUSEINST, "${fuseinst}") diff --git a/sys-fs/siefs/files/siefs-0.5-qa-fixes.patch b/sys-fs/siefs/files/siefs-0.5-qa-fixes.patch index 59feeae61e11..dbd8a30fb1c7 100644 --- a/sys-fs/siefs/files/siefs-0.5-qa-fixes.patch +++ b/sys-fs/siefs/files/siefs-0.5-qa-fixes.patch @@ -1,3 +1,18 @@ +diff -Nru siefs-0.5.orig/siefs/Makefile.am siefs-0.5/siefs/Makefile.am +--- siefs-0.5.orig/siefs/Makefile.am 2005-04-05 14:36:28.000000000 +0000 ++++ siefs-0.5/siefs/Makefile.am 2009-03-03 20:59:05.000000000 +0000 +@@ -9,8 +9,8 @@ + slink_SOURCES = slink.c obex.c obex.h transport.c transport.h comm.c comm.h \ + crcmodel.c crcmodel.h + +-LDADD = $(fuseinst)/lib/libfuse.a -lpthread ++LDADD = -lfuse -lpthread + + install-exec-hook: +- -rm -f /sbin/mount.siefs +- -ln -s $(DESTDIR)$(bindir)/siefs /sbin/mount.siefs ++ -mkdir $(DESTDIR)/sbin/ ++ -ln -s ..$(bindir)/siefs $(DESTDIR)/sbin/mount.siefs diff -Nru siefs-0.5.orig/siefs/charset.c siefs-0.5/siefs/charset.c --- siefs-0.5.orig/siefs/charset.c 2005-04-05 17:15:47.000000000 +0300 +++ siefs-0.5/siefs/charset.c 2007-05-23 14:13:19.000000000 +0300 |