1 |
eva 08/10/11 15:18:48 |
2 |
|
3 |
Modified: ChangeLog nautilus-2.22.5.1-r1.ebuild |
4 |
Added: nautilus-2.20.0-r2.ebuild |
5 |
Log: |
6 |
Fix exempi automagic detection, bug #206041 in preparation of bug #185689. |
7 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64, RepoMan options: --force) |
8 |
|
9 |
Revision Changes Path |
10 |
1.278 gnome-base/nautilus/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/ChangeLog?rev=1.278&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/ChangeLog?rev=1.278&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/ChangeLog?r1=1.277&r2=1.278 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v |
19 |
retrieving revision 1.277 |
20 |
retrieving revision 1.278 |
21 |
diff -u -r1.277 -r1.278 |
22 |
--- ChangeLog 28 Sep 2008 09:09:58 -0000 1.277 |
23 |
+++ ChangeLog 11 Oct 2008 15:18:48 -0000 1.278 |
24 |
@@ -1,6 +1,14 @@ |
25 |
# ChangeLog for gnome-base/nautilus |
26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.277 2008/09/28 09:09:58 leio Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.278 2008/10/11 15:18:48 eva Exp $ |
29 |
+ |
30 |
+*nautilus-2.20.0-r2 (11 Oct 2008) |
31 |
+ |
32 |
+ 11 Oct 2008; Gilles Dartiguelongue <eva@g.o> |
33 |
+ +files/nautilus-2.20.0-exempi.patch, |
34 |
+ +files/nautilus-2.22.5.1-exempi.patch, +nautilus-2.20.0-r2.ebuild, |
35 |
+ nautilus-2.22.5.1-r1.ebuild: |
36 |
+ Fix exempi automagic detection, bug #206041 in preparation of bug #185689. |
37 |
|
38 |
28 Sep 2008; Mart Raudsepp <leio@g.o> |
39 |
+files/nautilus-2.22.5.1-fix-stat-include.patch, nautilus-2.22.5.1.ebuild, |
40 |
|
41 |
|
42 |
|
43 |
1.4 gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild?rev=1.4&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild?rev=1.4&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild?r1=1.3&r2=1.4 |
48 |
|
49 |
Index: nautilus-2.22.5.1-r1.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild,v |
52 |
retrieving revision 1.3 |
53 |
retrieving revision 1.4 |
54 |
diff -u -r1.3 -r1.4 |
55 |
--- nautilus-2.22.5.1-r1.ebuild 28 Sep 2008 09:09:59 -0000 1.3 |
56 |
+++ nautilus-2.22.5.1-r1.ebuild 11 Oct 2008 15:18:48 -0000 1.4 |
57 |
@@ -1,8 +1,8 @@ |
58 |
# Copyright 1999-2008 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild,v 1.3 2008/09/28 09:09:59 leio Exp $ |
61 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild,v 1.4 2008/10/11 15:18:48 eva Exp $ |
62 |
|
63 |
-inherit virtualx eutils gnome2 |
64 |
+inherit autotools eutils gnome2 virtualx |
65 |
|
66 |
DESCRIPTION="A file manager for the GNOME desktop" |
67 |
HOMEPAGE="http://www.gnome.org/projects/nautilus/" |
68 |
@@ -41,7 +41,7 @@ |
69 |
DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO" |
70 |
|
71 |
pkg_setup() { |
72 |
- G2CONF="--disable-update-mimedb $(use_enable beagle) $(use_enable tracker)" |
73 |
+ G2CONF="--disable-update-mimedb --disable-xmp $(use_enable beagle) $(use_enable tracker)" |
74 |
} |
75 |
|
76 |
src_unpack() { |
77 |
@@ -56,6 +56,11 @@ |
78 |
|
79 |
# Build fix |
80 |
epatch "${FILESDIR}/${P}-fix-stat-include.patch" |
81 |
+ |
82 |
+ # Fix automagic exempi detection, bug #206041 |
83 |
+ epatch "${FILESDIR}/${P}-exempi.patch" |
84 |
+ |
85 |
+ eautoreconf |
86 |
} |
87 |
|
88 |
src_test() { |
89 |
|
90 |
|
91 |
|
92 |
1.1 gnome-base/nautilus/nautilus-2.20.0-r2.ebuild |
93 |
|
94 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/nautilus-2.20.0-r2.ebuild?rev=1.1&view=markup |
95 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/nautilus-2.20.0-r2.ebuild?rev=1.1&content-type=text/plain |
96 |
|
97 |
Index: nautilus-2.20.0-r2.ebuild |
98 |
=================================================================== |
99 |
# Copyright 1999-2008 Gentoo Foundation |
100 |
# Distributed under the terms of the GNU General Public License v2 |
101 |
# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.20.0-r2.ebuild,v 1.1 2008/10/11 15:18:48 eva Exp $ |
102 |
|
103 |
inherit virtualx eutils gnome2 autotools |
104 |
|
105 |
DESCRIPTION="A file manager for the GNOME desktop" |
106 |
HOMEPAGE="http://www.gnome.org/projects/nautilus/" |
107 |
|
108 |
LICENSE="GPL-2 LGPL-2 FDL-1.1" |
109 |
SLOT="0" |
110 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
111 |
IUSE="beagle esd gnome tracker" |
112 |
# cups flac gstreamer mad ogg vorbis |
113 |
|
114 |
RDEPEND=">=media-libs/libart_lgpl-2.3.10 |
115 |
>=gnome-base/libbonobo-2.1 |
116 |
>=gnome-base/eel-2.15.92 |
117 |
esd? ( >=media-sound/esound-0.2.27 ) |
118 |
>=dev-libs/glib-2.13 |
119 |
>=gnome-base/gnome-desktop-2.9.91 |
120 |
>=gnome-base/libgnome-2.14.0 |
121 |
>=gnome-base/libgnomeui-2.6 |
122 |
>=gnome-base/gnome-vfs-2.19.3 |
123 |
>=gnome-base/orbit-2.4 |
124 |
>=x11-libs/pango-1.1.2 |
125 |
>=x11-libs/gtk+-2.11.6 |
126 |
>=gnome-base/librsvg-2.0.1 |
127 |
>=dev-libs/libxml2-2.4.7 |
128 |
>=x11-libs/startup-notification-0.8 |
129 |
>=media-libs/libexif-0.5.12 |
130 |
>=gnome-base/gconf-2 |
131 |
media-libs/audiofile |
132 |
beagle? ( =app-misc/beagle-0.2* ) |
133 |
x86? ( tracker? ( >=app-misc/tracker-0.0.1 ) ) |
134 |
x11-libs/libICE |
135 |
x11-libs/libSM |
136 |
x11-proto/xproto |
137 |
virtual/eject" |
138 |
# !gstreamer? ( vorbis? ( media-sound/vorbis-tools ) ) |
139 |
# gstreamer? ( |
140 |
# >=media-libs/gstreamer-0.8 |
141 |
# >=media-libs/gst-plugins-0.8 |
142 |
# >=media-plugins/gst-plugins-gnomevfs-0.8 |
143 |
# mad? ( >=media-plugins/gst-plugins-mad-0.8 ) |
144 |
# ogg? ( >=media-plugins/gst-plugins-ogg-0.8 ) |
145 |
# vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8 ) |
146 |
# flac? ( >=media-plugins/gst-plugins-flac-0.8 ) )" |
147 |
DEPEND="${RDEPEND} |
148 |
sys-devel/gettext |
149 |
>=dev-util/intltool-0.35 |
150 |
>=dev-util/pkgconfig-0.9" |
151 |
PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )" |
152 |
|
153 |
DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO" |
154 |
|
155 |
pkg_setup() { |
156 |
G2CONF="--disable-update-mimedb --disable-xmp $(use_enable beagle) $(use_enable tracker) $(use_enable esd esound)" |
157 |
} |
158 |
|
159 |
src_unpack() { |
160 |
gnome2_src_unpack |
161 |
|
162 |
epatch "${FILESDIR}/${P}-sound-preview-cleanup.patch" |
163 |
epatch "${FILESDIR}/${P}-statfs.patch" |
164 |
|
165 |
# Patches from unreleased 2.20.1 |
166 |
epatch "${FILESDIR}/${P}-async-thumbnail-framing.patch" |
167 |
epatch "${FILESDIR}/${P}-thumbnail-flashing.patch" |
168 |
epatch "${FILESDIR}/${P}-small-font-crasher.patch" |
169 |
|
170 |
# Fix for autoconf 2.62, see Gnome Bug #527315 |
171 |
epatch "${FILESDIR}/${P}-fix_broken_configure.patch" |
172 |
|
173 |
# Fix automagic exempi detection, bug #206041 |
174 |
epatch "${FILESDIR}/${P}-exempi.patch" |
175 |
|
176 |
eautoreconf |
177 |
} |
178 |
|
179 |
src_test() { |
180 |
addwrite "/root/.gnome2_private" |
181 |
unset SESSION_MANAGER |
182 |
Xmake check || die "Test phase failed" |
183 |
} |
184 |
|
185 |
pkg_postinst() { |
186 |
gnome2_pkg_postinst |
187 |
|
188 |
elog "nautilus now has three ways of previewing sound. First, if the esd" |
189 |
elog "USE flag is given, it will attempt to play directly via esd. If" |
190 |
elog "the esd USE flag is *not* given, it will attempt to use totem to" |
191 |
elog "play the sound. If totem is not installed, it will attempt to use" |
192 |
elog "gstreamer 10.x to play the sound. If gstreamer 10.x is not installed" |
193 |
elog "it will fail to preview the sound." |
194 |
} |