Archives
Archives
| From: | "Alin Nastac (mrness)" <mrness@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in sys-fs/siefs/files: siefs-0.5-qa-fixes.patch siefs-0.5-external-vmoconv.patch |
| Date: | Sun, 22 Mar 2009 10:41:41 |
| Message-Id: | E1LlL7b-0001V0-6N@stork.gentoo.org |
| 1 | mrness 09/03/22 10:41:39 |
| 2 | |
| 3 | Modified: siefs-0.5-qa-fixes.patch |
| 4 | Added: siefs-0.5-external-vmoconv.patch |
| 5 | Log: |
| 6 | Fix collision with app-mobilephone/vmoconv (#256570). |
| 7 | (Portage version: 2.1.6.7/cvs/Linux x86_64) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.2 sys-fs/siefs/files/siefs-0.5-qa-fixes.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/siefs/files/siefs-0.5-qa-fixes.patch?rev=1.2&view=markup |
| 13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/siefs/files/siefs-0.5-qa-fixes.patch?rev=1.2&content-type=text/plain |
| 14 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/siefs/files/siefs-0.5-qa-fixes.patch?r1=1.1&r2=1.2 |
| 15 | |
| 16 | Index: siefs-0.5-qa-fixes.patch |
| 17 | =================================================================== |
| 18 | RCS file: /var/cvsroot/gentoo-x86/sys-fs/siefs/files/siefs-0.5-qa-fixes.patch,v |
| 19 | retrieving revision 1.1 |
| 20 | retrieving revision 1.2 |
| 21 | diff -u -r1.1 -r1.2 |
| 22 | --- siefs-0.5-qa-fixes.patch 23 May 2007 11:17:20 -0000 1.1 |
| 23 | +++ siefs-0.5-qa-fixes.patch 22 Mar 2009 10:41:39 -0000 1.2 |
| 24 | @@ -1,3 +1,18 @@ |
| 25 | +diff -Nru siefs-0.5.orig/siefs/Makefile.am siefs-0.5/siefs/Makefile.am |
| 26 | +--- siefs-0.5.orig/siefs/Makefile.am 2005-04-05 14:36:28.000000000 +0000 |
| 27 | ++++ siefs-0.5/siefs/Makefile.am 2009-03-03 20:59:05.000000000 +0000 |
| 28 | +@@ -9,8 +9,8 @@ |
| 29 | + slink_SOURCES = slink.c obex.c obex.h transport.c transport.h comm.c comm.h \ |
| 30 | + crcmodel.c crcmodel.h |
| 31 | + |
| 32 | +-LDADD = $(fuseinst)/lib/libfuse.a -lpthread |
| 33 | ++LDADD = -lfuse -lpthread |
| 34 | + |
| 35 | + install-exec-hook: |
| 36 | +- -rm -f /sbin/mount.siefs |
| 37 | +- -ln -s $(DESTDIR)$(bindir)/siefs /sbin/mount.siefs |
| 38 | ++ -mkdir $(DESTDIR)/sbin/ |
| 39 | ++ -ln -s ..$(bindir)/siefs $(DESTDIR)/sbin/mount.siefs |
| 40 | diff -Nru siefs-0.5.orig/siefs/charset.c siefs-0.5/siefs/charset.c |
| 41 | --- siefs-0.5.orig/siefs/charset.c 2005-04-05 17:15:47.000000000 +0300 |
| 42 | +++ siefs-0.5/siefs/charset.c 2007-05-23 14:13:19.000000000 +0300 |
| 43 | |
| 44 | |
| 45 | |
| 46 | 1.1 sys-fs/siefs/files/siefs-0.5-external-vmoconv.patch |
| 47 | |
| 48 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/siefs/files/siefs-0.5-external-vmoconv.patch?rev=1.1&view=markup |
| 49 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/siefs/files/siefs-0.5-external-vmoconv.patch?rev=1.1&content-type=text/plain |
| 50 | |
| 51 | Index: siefs-0.5-external-vmoconv.patch |
| 52 | =================================================================== |
| 53 | diff -Nru siefs-0.5.orig/configure.in siefs-0.5/configure.in |
| 54 | --- siefs-0.5.orig/configure.in 2005-04-04 05:15:31.000000000 +0000 |
| 55 | +++ siefs-0.5/configure.in 2009-03-03 20:55:08.000000000 +0000 |
| 56 | @@ -50,7 +50,7 @@ |
| 57 | AC_MSG_RESULT(${fuseinst}) |
| 58 | AC_SUBST(fuseinst) |
| 59 | |
| 60 | -subdirs="siefs converter" |
| 61 | +subdirs="siefs" |
| 62 | AC_SUBST(subdirs) |
| 63 | |
| 64 | AC_DEFINE_UNQUOTED(FUSEINST, "${fuseinst}") |