1 |
tetromino 12/04/02 07:34:48 |
2 |
|
3 |
Modified: ChangeLog gvfs-1.12.0.ebuild gvfs-1.10.1.ebuild |
4 |
Log: |
5 |
Fix building against >=libimobiledevice-1.1.2 (bug #410411, thanks to Leo Laursen for reporting). |
6 |
|
7 |
(Portage version: 2.2.0_alpha98/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.171 gnome-base/gvfs/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/ChangeLog?rev=1.171&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/ChangeLog?rev=1.171&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/ChangeLog?r1=1.170&r2=1.171 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v |
19 |
retrieving revision 1.170 |
20 |
retrieving revision 1.171 |
21 |
diff -u -r1.170 -r1.171 |
22 |
--- ChangeLog 28 Mar 2012 01:03:40 -0000 1.170 |
23 |
+++ ChangeLog 2 Apr 2012 07:34:47 -0000 1.171 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for gnome-base/gvfs |
26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.170 2012/03/28 01:03:40 tetromino Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.171 2012/04/02 07:34:47 tetromino Exp $ |
29 |
+ |
30 |
+ 02 Apr 2012; Alexandre Rostovtsev <tetromino@g.o> gvfs-1.10.1.ebuild, |
31 |
+ +files/gvfs-1.10.1-libimobiledevice-1.1.2.patch, gvfs-1.12.0.ebuild: |
32 |
+ Fix building against >=libimobiledevice-1.1.2 (bug #410411, thanks to Leo |
33 |
+ Laursen for reporting). |
34 |
|
35 |
*gvfs-1.12.0 (28 Mar 2012) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.2 gnome-base/gvfs/gvfs-1.12.0.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: gvfs-1.12.0.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- gvfs-1.12.0.ebuild 28 Mar 2012 01:03:40 -0000 1.1 |
53 |
+++ gvfs-1.12.0.ebuild 2 Apr 2012 07:34:47 -0000 1.2 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2012 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild,v 1.1 2012/03/28 01:03:40 tetromino Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild,v 1.2 2012/04/02 07:34:47 tetromino Exp $ |
59 |
|
60 |
EAPI=4 |
61 |
GCONF_DEBUG=no |
62 |
@@ -104,7 +104,10 @@ |
63 |
sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die |
64 |
fi |
65 |
|
66 |
- if use gphoto2 || use archive || use prefix; then |
67 |
+ # bug #410411, https://bugzilla.gnome.org/show_bug.cgi?id=672693 |
68 |
+ use ios && epatch "${FILESDIR}/${PN}-1.10.1-libimobiledevice-1.1.2.patch" |
69 |
+ |
70 |
+ if use gphoto2 || use archive || use prefix || use ios; then |
71 |
# libgcrypt.m4 needed for eautoreconf, bug #399043 |
72 |
mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die |
73 |
|
74 |
|
75 |
|
76 |
|
77 |
1.13 gnome-base/gvfs/gvfs-1.10.1.ebuild |
78 |
|
79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild?rev=1.13&view=markup |
80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild?rev=1.13&content-type=text/plain |
81 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild?r1=1.12&r2=1.13 |
82 |
|
83 |
Index: gvfs-1.10.1.ebuild |
84 |
=================================================================== |
85 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v |
86 |
retrieving revision 1.12 |
87 |
retrieving revision 1.13 |
88 |
diff -u -r1.12 -r1.13 |
89 |
--- gvfs-1.10.1.ebuild 25 Mar 2012 16:26:39 -0000 1.12 |
90 |
+++ gvfs-1.10.1.ebuild 2 Apr 2012 07:34:47 -0000 1.13 |
91 |
@@ -1,6 +1,6 @@ |
92 |
# Copyright 1999-2012 Gentoo Foundation |
93 |
# Distributed under the terms of the GNU General Public License v2 |
94 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.12 2012/03/25 16:26:39 armin76 Exp $ |
95 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.13 2012/04/02 07:34:47 tetromino Exp $ |
96 |
|
97 |
EAPI=4 |
98 |
GCONF_DEBUG=no |
99 |
@@ -105,7 +105,10 @@ |
100 |
sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die |
101 |
fi |
102 |
|
103 |
- if use gphoto2 || use archive || use prefix; then |
104 |
+ # bug #410411, https://bugzilla.gnome.org/show_bug.cgi?id=672693 |
105 |
+ use ios && epatch "${FILESDIR}/${PN}-1.10.1-libimobiledevice-1.1.2.patch" |
106 |
+ |
107 |
+ if use gphoto2 || use archive || use prefix || use ios; then |
108 |
# libgcrypt.m4 needed for eautoreconf, bug #399043 |
109 |
mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die |