diff options
author | Leonardo Boshell <leonardop@gentoo.org> | 2005-07-13 02:14:42 +0000 |
---|---|---|
committer | Leonardo Boshell <leonardop@gentoo.org> | 2005-07-13 02:14:42 +0000 |
commit | 12974524eb25681ee244a9601179d851b9c72b0f (patch) | |
tree | 44d8e18beee7ce9bd26db607e3ef1ebdf261ca85 /gnome-base | |
parent | Make threads support optional, minor fixes. (diff) | |
download | gentoo-2-12974524eb25681ee244a9601179d851b9c72b0f.tar.gz gentoo-2-12974524eb25681ee244a9601179d851b9c72b0f.tar.bz2 gentoo-2-12974524eb25681ee244a9601179d851b9c72b0f.zip |
New revision. Added patches for bugs #96721 and #95606.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/nautilus/ChangeLog | 13 | ||||
-rw-r--r-- | gnome-base/nautilus/Manifest | 3 | ||||
-rw-r--r-- | gnome-base/nautilus/files/digest-nautilus-2.10.1-r1 | 1 | ||||
-rw-r--r-- | gnome-base/nautilus/files/nautilus-2.10.1-deselect.patch | 13 | ||||
-rw-r--r-- | gnome-base/nautilus/files/nautilus-2.10.1-font_sizes.patch | 23 | ||||
-rw-r--r-- | gnome-base/nautilus/nautilus-2.10.1-r1.ebuild | 105 |
6 files changed, 157 insertions, 1 deletions
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog index a652cfdb1971..a6a6e0579dd8 100644 --- a/gnome-base/nautilus/ChangeLog +++ b/gnome-base/nautilus/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for gnome-base/nautilus # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.141 2005/07/12 12:39:57 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.142 2005/07/13 02:14:42 leonardop Exp $ + +*nautilus-2.10.1-r1 (12 Jul 2005) + + 12 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> + nautilus-2.10.1-r1.ebuild, files/nautilus-2.10.1-font_sizes.patch, + files/nautilus-2.10.1-deselect.patch: + New revision. Added patch from upstream's CVS repository to improve font + sizes for the icon view, resolves bug #96721. Added upstream patch to fix + deselecting items in list view and single click mode, resolves bug #95606. + Added RESTRICT=test since the only implemented check requires write + permissions on $HOME, among other things. 12 Jul 2005; Leonardo Boshell <geoman@gentoo.org> nautilus-2.10.0.ebuild, nautilus-2.10.1.ebuild: diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index 24cad40d8abd..d5f498ebfa0c 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,9 +1,12 @@ MD5 115e84ac5d6492c5d72c9033a89e18fb ChangeLog 18497 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 00c95b6b319c4650c8e666dbe2354c7a nautilus-1.0.6-r9.ebuild 3398 +MD5 f9fcdb1e9f9ebeb8da4babaac91f3845 nautilus-2.10.1-r1.ebuild 2661 MD5 c0ed9135a2a082d9b804280bbbf62c57 nautilus-2.10.0.ebuild 2587 MD5 d6f6da2d532de48270a1bfe87142a545 nautilus-2.10.1.ebuild 2540 MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68 +MD5 29bf62fc0e7eaa6cd6aa5cf4e2dd291d files/nautilus-2.10.1-font_sizes.patch 1532 +MD5 567191aa3b9ef17acb8e3b0ba006afdf files/digest-nautilus-2.10.1-r1 69 MD5 4c62404b0162ab39572cb522fed222c4 files/nautilus-1.0.6-hyperbola.diff 1632 MD5 47ad4a802bbd17967708599cda1b7aaf files/nautilus-1.0.6-mozilla-1.0_rc1.diff 920 MD5 d7ad0d83dbafefa25a34a50e2ee34806 files/nautilus-1.0.6-mozilla-1.0_rc3.diff 1709 diff --git a/gnome-base/nautilus/files/digest-nautilus-2.10.1-r1 b/gnome-base/nautilus/files/digest-nautilus-2.10.1-r1 new file mode 100644 index 000000000000..ba3eb814a675 --- /dev/null +++ b/gnome-base/nautilus/files/digest-nautilus-2.10.1-r1 @@ -0,0 +1 @@ +MD5 976d725db15e901bc881dfb8c50145c1 nautilus-2.10.1.tar.bz2 5960278 diff --git a/gnome-base/nautilus/files/nautilus-2.10.1-deselect.patch b/gnome-base/nautilus/files/nautilus-2.10.1-deselect.patch new file mode 100644 index 000000000000..5dd1c10542aa --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-2.10.1-deselect.patch @@ -0,0 +1,13 @@ +diff -NurdB nautilus-2.10.1/src/file-manager/fm-list-view.c nautilus-2.10.1-patched/src/file-manager/fm-list-view.c +--- nautilus-2.10.1/src/file-manager/fm-list-view.c 2005-04-11 03:05:58.000000000 -0500 ++++ nautilus-2.10.1-patched/src/file-manager/fm-list-view.c 2005-07-12 20:19:32.000000000 -0500 +@@ -248,8 +248,7 @@ + if ((event->button == 1 || event->button == 2) + && ((event->state & GDK_CONTROL_MASK) != 0 || + (event->state & GDK_SHIFT_MASK) == 0) +- && view->details->row_selected_on_button_down +- && (click_policy_auto_value == NAUTILUS_CLICK_POLICY_DOUBLE)) { ++ && view->details->row_selected_on_button_down) { + if (!button_event_modifies_selection (event)) { + gtk_tree_selection_unselect_all (selection); + gtk_tree_selection_select_path (selection, path); diff --git a/gnome-base/nautilus/files/nautilus-2.10.1-font_sizes.patch b/gnome-base/nautilus/files/nautilus-2.10.1-font_sizes.patch new file mode 100644 index 000000000000..28526de56364 --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-2.10.1-font_sizes.patch @@ -0,0 +1,23 @@ +diff -NurdB nautilus-2.10.1/libnautilus-private/nautilus-icon-container.c nautilus-2.10.1-patched/libnautilus-private/nautilus-icon-container.c +--- nautilus-2.10.1/libnautilus-private/nautilus-icon-container.c 2005-02-18 03:57:17.000000000 -0500 ++++ nautilus-2.10.1-patched/libnautilus-private/nautilus-icon-container.c 2005-07-12 08:10:01.000000000 -0500 +@@ -4353,13 +4353,13 @@ + + details->zoom_level = NAUTILUS_ZOOM_LEVEL_STANDARD; + +- details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALLEST] = -3 * PANGO_SCALE; +- details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALLER] = -3 * PANGO_SCALE; +- details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALL] = -2 * PANGO_SCALE; ++ details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALLEST] = -2 * PANGO_SCALE; ++ details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALLER] = -2 * PANGO_SCALE; ++ details->font_size_table[NAUTILUS_ZOOM_LEVEL_SMALL] = -0 * PANGO_SCALE; + details->font_size_table[NAUTILUS_ZOOM_LEVEL_STANDARD] = 0 * PANGO_SCALE; +- details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGE] = 2 * PANGO_SCALE; +- details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGER] = 4 * PANGO_SCALE; +- details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGEST] = 4 * PANGO_SCALE; ++ details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGE] = 0 * PANGO_SCALE; ++ details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGER] = 0 * PANGO_SCALE; ++ details->font_size_table[NAUTILUS_ZOOM_LEVEL_LARGEST] = 0 * PANGO_SCALE; + + container->details = details; + diff --git a/gnome-base/nautilus/nautilus-2.10.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.10.1-r1.ebuild new file mode 100644 index 000000000000..1c944a4a27f4 --- /dev/null +++ b/gnome-base/nautilus/nautilus-2.10.1-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.10.1-r1.ebuild,v 1.1 2005/07/13 02:14:42 leonardop Exp $ + +inherit gnome2 eutils + +DESCRIPTION="A filemanager for the Gnome2 desktop" +HOMEPAGE="http://www.gnome.org/projects/nautilus/" + +LICENSE="GPL-2 LGPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="oggvorbis gstreamer mad flac" +# cups + +RDEPEND=">=dev-libs/glib-2.6 + >=x11-libs/pango-1.2 + >=x11-libs/gtk+-2.3 + >=dev-libs/libxml2-2.4.7 + =gnome-base/eel-${PV}* + >=gnome-base/gnome-vfs-2.9.1 + >=media-sound/esound-0.2.27 + >=gnome-base/gconf-2 + >=gnome-base/libgnome-2.6 + >=gnome-base/libgnomeui-2.6 + >=gnome-base/gnome-desktop-2.9.91 + >=media-libs/libart_lgpl-2.3.10 + >=gnome-base/libbonobo-2.2 + >=gnome-base/librsvg-2.0.1 + >=gnome-base/orbit-2.4 + >=x11-libs/startup-notification-0.8 + >=media-libs/libexif-0.5.12 + dev-libs/popt + virtual/fam + virtual/eject + !gstreamer? ( oggvorbis? ( media-sound/vorbis-tools ) ) + gstreamer? ( + >=media-libs/gstreamer-0.8 + >=media-libs/gst-plugins-0.8 + >=media-plugins/gst-plugins-gnomevfs-0.8 + mad? ( >=media-plugins/gst-plugins-mad-0.8 ) + oggvorbis? ( + >=media-plugins/gst-plugins-ogg-0.8 + >=media-plugins/gst-plugins-vorbis-0.8 + ) + flac? ( >=media-plugins/gst-plugins-flac-0.8 ) + )" + +# FIXME : what to do with exif/jpeg config stuff ? + +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/intltool-0.29 + >=app-text/scrollkeeper-0.3.11 + >=dev-util/pkgconfig-0.12.0" + +PDEPEND=">=x11-themes/gnome-icon-theme-1.1.91 + x11-themes/gnome-themes" + +RESTRICT="test" + +DOCS="AUTHORS ChangeLo* HACKING MAINTAINERS NEWS README THANKS TODO" + +G2CONF="${G2CONF} $(use_enable gstreamer)" + +src_unpack() { + + unpack ${A} + cd ${S} + + # use gstreamer for audio preview (patch by <foser@gentoo.org>) + use gstreamer && epatch ${FILESDIR}/${PN}-2.9.90-icon_view_gst.patch + + # Upstream patch to improve font sizes for the icon view. + # See bug #96721. + epatch ${FILESDIR}/${P}-font_sizes.patch + + # Upstream patch to fix deselecting items in list view and single click + # mode. See bug #95606. + epatch ${FILESDIR}/${P}-deselect.patch + + # -- Component architecture has changed in 2.9 -- this +# -- patch no longer applies. + + # add libgnomeprint support + # With extra 2.8 fun - fixes #65604 +# if use cups; then +# if has_version ">=net-print/gnome-cups-manager-0.28"; then +# epatch ${FILESDIR}/${PN}-2.8-x-printers.patch +# else +# epatch ${FILESDIR}/${PN}-2-x-printers.patch +# fi +# fi + + # stop nautilus linking to cdda/paranoia + sed -i -e "/^CORE_LIBS/s/\$CDDA_LIBS//" configure.in + + if use gstreamer; then + WANT_AUTOCONF=2.5 autoheader || die + WANT_AUTOCONF=2.5 autoconf || die + WANT_AUTOMAKE=1.7 automake || die + fi +} + +USE_DESTDIR="1" |