From ebe0868c11808662c3a59c494baa616b81097247 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Wed, 10 Jan 2007 06:24:08 +0000 Subject: Prune old versions (Portage version: 2.1.2_rc4-r7) (Signed Manifest commit) --- gnome-base/nautilus/files/digest-nautilus-2.16.1 | 3 - gnome-base/nautilus/files/digest-nautilus-2.16.2 | 3 - .../nautilus/files/digest-nautilus-2.16.2-r1 | 3 - .../nautilus-2.16.2-desktop-icon-position.patch | 25 --- .../files/nautilus-2.9.90-icon_view_gst.patch | 240 --------------------- 5 files changed, 274 deletions(-) delete mode 100644 gnome-base/nautilus/files/digest-nautilus-2.16.1 delete mode 100644 gnome-base/nautilus/files/digest-nautilus-2.16.2 delete mode 100644 gnome-base/nautilus/files/digest-nautilus-2.16.2-r1 delete mode 100644 gnome-base/nautilus/files/nautilus-2.16.2-desktop-icon-position.patch delete mode 100644 gnome-base/nautilus/files/nautilus-2.9.90-icon_view_gst.patch (limited to 'gnome-base/nautilus/files') diff --git a/gnome-base/nautilus/files/digest-nautilus-2.16.1 b/gnome-base/nautilus/files/digest-nautilus-2.16.1 deleted file mode 100644 index 92072d02088e..000000000000 --- a/gnome-base/nautilus/files/digest-nautilus-2.16.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 bac53a70c9517cda421f440721e095c9 nautilus-2.16.1.tar.bz2 4258919 -RMD160 6fd06a3af58c2ba9e2df3a3847e20d2f9d719206 nautilus-2.16.1.tar.bz2 4258919 -SHA256 48818f5e2c9e981a6c75a61e462ac4050f7ffbf1c620a62fd7b3e57669484e37 nautilus-2.16.1.tar.bz2 4258919 diff --git a/gnome-base/nautilus/files/digest-nautilus-2.16.2 b/gnome-base/nautilus/files/digest-nautilus-2.16.2 deleted file mode 100644 index c6f9b825ef46..000000000000 --- a/gnome-base/nautilus/files/digest-nautilus-2.16.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d6354ad96efcd0f89ed4c13ad940d5f5 nautilus-2.16.2.tar.bz2 4266971 -RMD160 db9e392aa9357f85e44bb03052ecf38f6c87f46d nautilus-2.16.2.tar.bz2 4266971 -SHA256 6306fe9ee0371da309a870627a94fba88c3848a5fa83b863d28688ed57d9ba11 nautilus-2.16.2.tar.bz2 4266971 diff --git a/gnome-base/nautilus/files/digest-nautilus-2.16.2-r1 b/gnome-base/nautilus/files/digest-nautilus-2.16.2-r1 deleted file mode 100644 index c6f9b825ef46..000000000000 --- a/gnome-base/nautilus/files/digest-nautilus-2.16.2-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d6354ad96efcd0f89ed4c13ad940d5f5 nautilus-2.16.2.tar.bz2 4266971 -RMD160 db9e392aa9357f85e44bb03052ecf38f6c87f46d nautilus-2.16.2.tar.bz2 4266971 -SHA256 6306fe9ee0371da309a870627a94fba88c3848a5fa83b863d28688ed57d9ba11 nautilus-2.16.2.tar.bz2 4266971 diff --git a/gnome-base/nautilus/files/nautilus-2.16.2-desktop-icon-position.patch b/gnome-base/nautilus/files/nautilus-2.16.2-desktop-icon-position.patch deleted file mode 100644 index 935864c5d13a..000000000000 --- a/gnome-base/nautilus/files/nautilus-2.16.2-desktop-icon-position.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- src/file-manager/fm-icon-view.c.orig 2006-11-14 16:35:04.304162544 +0000 -+++ src/file-manager/fm-icon-view.c 2006-11-14 16:51:02.820445920 +0000 -@@ -531,12 +531,20 @@ - file_has_lazy_position (FMDirectoryView *view, - NautilusFile *file) - { -+ gboolean lazy_position; -+ - /* For volumes (i.e. cdrom icon) we use lazy positioning so that when - * an old cdrom gets re-mounted in a place that now has another - * icon we don't overlap that one. - */ -- -- return NAUTILUS_IS_DESKTOP_ICON_FILE (file); -+ lazy_position = nautilus_file_has_volume (file); -+ if (lazy_position && fm_directory_view_get_loading (view)) { -+ /* if volumes are loaded during directory load, don't mark them -+ * as lazy. This is wrong for files that were mounted during user -+ * log-off, but it is right for files that were mounted during login. */ -+ lazy_position = FALSE; -+ } -+ return lazy_position; - } - - static void diff --git a/gnome-base/nautilus/files/nautilus-2.9.90-icon_view_gst.patch b/gnome-base/nautilus/files/nautilus-2.9.90-icon_view_gst.patch deleted file mode 100644 index 43017e6c0d97..000000000000 --- a/gnome-base/nautilus/files/nautilus-2.9.90-icon_view_gst.patch +++ /dev/null @@ -1,240 +0,0 @@ -diff -ur nautilus-2.9.90/configure.in nautilus-2.9.90-patched/configure.in ---- nautilus-2.9.90/configure.in 2005-01-25 22:57:34.000000000 +0800 -+++ nautilus-2.9.90-patched/configure.in 2005-02-03 19:35:49.240088040 +0800 -@@ -19,6 +19,7 @@ - m4_define(xml_minver, 2.4.7) - m4_define(startup_notification_minver, 0.5) - m4_define(exif_minver, 0.5.12) -+m4_define(gstreamer_minver, 0.6.0) - - AC_INIT(nautilus, 2.9.90, - [http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus]) -@@ -48,6 +49,7 @@ - AC_SUBST(RSVG_REQUIRED, [rsvg_minver]) - AC_SUBST(XML_REQUIRED, [xml_minver]) - AC_SUBST(STARTUP_NOTIFICATION_REQUIRED, [startup_notification_minver]) -+AC_SUBST(GSTREAMER_REQUIRED, [gstreamer_minver]) - - - AC_C_BIGENDIAN -@@ -260,6 +262,53 @@ - AC_MSG_RESULT(no) - fi - -+ dnl ========================================================================== -+ -+dnl gstreamer checking -+ -+AC_ARG_ENABLE(gstreamer, -+ AC_HELP_STRING([--enable-gstreamer],[use GStreamer for sound preview]), -+ [case "${enableval}" in -+ yes) ENABLE_GST=yes ;; -+ no) ENABLE_GST=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-gstreamer) ;; -+ esac], -+ [ENABLE_GST=no]) dnl Default value -+ -+AC_MSG_CHECKING(for backend libraries) -+ -+if test x$ENABLE_GST = xyes; then -+ -+dnl Now we're ready to ask for gstreamer libs and cflags -+dnl And we can also ask for the right version of gstreamer -+ HAVE_GSTREAMER=no -+ -+dnl start with 0.7 -+ GST_MAJORMINOR=0.8 -+ PKG_CHECK_MODULES(GST, \ -+ gstreamer-gconf-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED, -+ HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no) -+ -+dnl try 0.6 -+ if test "x$HAVE_GSTREAMER" = "xno"; then -+ GST_MAJORMINOR=0.6 -+ PKG_CHECK_MODULES(GST, \ -+ gstreamer-gconf-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED, -+ HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no) -+ fi -+ -+dnl Give error and exit if we don't have gstreamer -+ if test "x$HAVE_GSTREAMER" = "xno"; then -+ AC_MSG_ERROR(you need gstreamer development packages installed !) -+ fi -+ -+ MM="gstreamer-libs-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED gstreamer-gconf-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED" -+ -+ AC_MSG_RESULT(GStreamer) -+ AC_DEFINE(USE_GST_AUDIO_PREVIEW,1,[Define if you want to use the GStreamer media framework]) -+ -+fi -+ - dnl ========================================================================== - - dnl gimphwrapbox -@@ -285,7 +334,7 @@ - AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS) - - dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires") --CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES" -+CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 $MM $EXTRA_CORE_MODULES" - CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags" - AC_SUBST(CORE_CFLAGS) - CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" -diff -ur nautilus-2.9.90/src/file-manager/fm-icon-view.c nautilus-2.9.90-patched/src/file-manager/fm-icon-view.c ---- nautilus-2.9.90/src/file-manager/fm-icon-view.c 2005-01-17 17:05:03.000000000 +0800 -+++ nautilus-2.9.90-patched/src/file-manager/fm-icon-view.c 2005-02-03 19:36:04.634747696 +0800 -@@ -79,8 +79,13 @@ - #include - #include - -+#ifdef USE_GST_AUDIO_PREVIEW -+#include -+#include -+#else - #define USE_OLD_AUDIO_PREVIEW 1 - #define READ_CHUNK_SIZE 16384 -+#endif - - #define POPUP_PATH_ICON_APPEARANCE "/selection/Icon Appearance Items" - -@@ -168,6 +173,10 @@ - static int preview_sound_auto_value; - static gboolean gnome_esd_enabled_auto_value; - -+#ifdef USE_GST_AUDIO_PREVIEW -+static GstElement *thread; -+#endif -+ - static void fm_icon_view_set_directory_sort_by (FMIconView *icon_view, - NautilusFile *file, - const char *sort_by); -@@ -1682,6 +1691,22 @@ - fm_directory_view_stop_batching_selection_changes (FM_DIRECTORY_VIEW (icon_view)); - } - -+#ifdef USE_GST_AUDIO_PREVIEW -+static void -+gst_end_of_stream_callback (GstElement *src, gpointer callback_data) -+{ -+ FMIconView *icon_view; -+ icon_view = FM_ICON_VIEW (callback_data); -+ -+ gst_element_set_state (GST_ELEMENT (thread), GST_STATE_NULL); -+ -+ if (icon_view->details->audio_preview_timeout != 0 ) { -+ g_source_remove (icon_view->details->audio_preview_timeout); -+ icon_view->details->audio_preview_timeout = 0; -+ } -+} -+#endif -+ - /* handle the preview signal by inspecting the mime type. For now, we only preview local sound files. */ - - /* here's the timer task that actually plays the file using mpg123, ogg123 or play. */ -@@ -1689,6 +1714,34 @@ - static gboolean - play_file (gpointer callback_data) - { -+#ifdef USE_GST_AUDIO_PREVIEW -+ gchar *file_uri; -+ GstElement *filesrc, *decoder, *audiosink; -+ FMIconView *icon_view; -+ -+ icon_view = FM_ICON_VIEW (callback_data); -+ file_uri = nautilus_file_get_uri (icon_view->details->audio_preview_file); -+ -+ if (file_uri != NULL && gst_init_check (NULL, NULL)) { -+ thread = gst_thread_new ("thread"); -+ filesrc = gst_element_factory_make ("gnomevfssrc", "disk_source"); -+ decoder = gst_element_factory_make ("spider", "spider"); -+ audiosink = gst_gconf_get_default_audio_sink (); -+ -+ g_object_set (G_OBJECT (filesrc), "location", file_uri, NULL); -+ g_signal_connect (G_OBJECT (filesrc), "eos", G_CALLBACK (gst_end_of_stream_callback), icon_view); -+ -+ gst_bin_add_many (GST_BIN (thread), filesrc, decoder, audiosink, NULL); -+ gst_element_link_many (filesrc, decoder, audiosink, NULL); -+ -+ gst_element_set_state (GST_ELEMENT (thread), GST_STATE_PLAYING); -+ } -+ -+ g_free (file_uri); -+ -+ icon_view->details->audio_preview_file = NULL; -+ icon_view->details->audio_preview_timeout = 0; -+#else - #if USE_OLD_AUDIO_PREVIEW - NautilusFile *file; - FMIconView *icon_view; -@@ -1813,6 +1866,7 @@ - icon_view->details->audio_preview_timeout = 0; - icon_view->details->audio_preview_file = NULL; - #endif -+#endif /* End USE_GST_AUDIO_PREVIEW */ - return FALSE; - } - -@@ -1827,6 +1881,21 @@ - static void - preview_audio (FMIconView *icon_view, NautilusFile *file, gboolean start_flag) - { -+#ifdef USE_GST_AUDIO_PREVIEW -+ if (thread != NULL) { -+ gst_element_set_state (GST_ELEMENT (thread), GST_STATE_NULL); -+ } -+ -+ if (icon_view->details->audio_preview_timeout != 0) { -+ g_source_remove (icon_view->details->audio_preview_timeout); -+ icon_view->details->audio_preview_timeout = 0; -+ } -+ -+ if (start_flag) { -+ icon_view->details->audio_preview_file = file; -+ icon_view->details->audio_preview_timeout = g_timeout_add (1000, play_file, icon_view); -+ } -+#else - /* Stop current audio playback */ - #if USE_OLD_AUDIO_PREVIEW - nautilus_sound_kill_sound (); -@@ -1851,15 +1920,18 @@ - icon_view->details->audio_preview_timeout = g_timeout_add (1000, play_file, icon_view); - #endif - } -+#endif /* End USE_GST_AUDIO_PREVIEW */ - } - - static gboolean - should_preview_sound (NautilusFile *file) - { -+#ifndef USE_GST_AUDIO_PREVIEW - /* Check gnome config sound preference */ - if (!gnome_esd_enabled_auto_value) { - return FALSE; - } -+#endif /* USE_GST_AUDIO_PREVIEW */ - - /* Check user performance preference */ - if (preview_sound_auto_value == NAUTILUS_SPEED_TRADEOFF_NEVER) { -@@ -1890,11 +1962,22 @@ - mime_type = nautilus_file_get_mime_type (file); - - if ((eel_istr_has_prefix (mime_type, "audio/") -+#ifdef USE_GST_AUDIO_PREVIEW -+ || eel_istr_has_prefix (mime_type, "application/ogg") -+ || eel_istr_has_prefix (mime_type, "application/x-ogg") -+ || eel_istr_has_prefix (mime_type, "application/flac") -+ || eel_istr_has_prefix (mime_type, "application/x-flac")) -+ && eel_strcasecmp (mime_type, "audio/x-pn-realaudio") != 0 -+ && eel_strcasecmp (mime_type, "audio/x-mpegurl") != 0 -+ ) { -+#else -+ - || eel_istr_has_prefix (mime_type, "application/ogg") - || eel_istr_has_prefix (mime_type, "application/x-ogg")) - && eel_strcasecmp (mime_type, "audio/x-pn-realaudio") != 0 - && eel_strcasecmp (mime_type, "audio/x-mpegurl") != 0 - && nautilus_sound_can_play_sound ()) { -+#endif - result = 1; - preview_audio (icon_view, file, start_flag); - } -- cgit v1.2.3-65-gdbad