rpms/totem
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Fri Aug 06 2010 Bastien Nocera <bnocera@redhat.com> 2.90.5-6

Browse Source 
- Update epoch to match Fedora 14
This commit is contained in:
Bastien Nocera 2010-11-02 16:34:47 +00:00
parent 2591f3fa42
commit d2a5e7c981
2 changed files with 15 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
fix-libpeas-0.5.3-api-changes.patch
View File

@ -1,98 +0,0 @@
From c73bd203eed8b8d1cb45f8746a988d8cda0d408d Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip@tecnocode.co.uk>
Date: Wed, 14 Jul 2010 22:24:48 +0000
Subject: Update builtin plugin support in line with the latest libpeas changes
Due to the changes in bgo#621858 we can drop some code which handled
hiding builtin plugins in the plugin manager.
---
diff --git a/src/plugins/totem-plugins-engine.c b/src/plugins/totem-plugins-engine.c
index 5be4d6e..4cd9f47 100644
--- a/src/plugins/totem-plugins-engine.c
+++ b/src/plugins/totem-plugins-engine.c
@@ -46,7 +46,6 @@
#define GCONF_PREFIX_PLUGINS GCONF_PREFIX"/plugins"
#define GCONF_PREFIX_PLUGIN GCONF_PREFIX"/plugins/%s"
#define GCONF_PLUGIN_ACTIVE GCONF_PREFIX_PLUGINS"/%s/active"
-#define GCONF_PLUGIN_HIDDEN GCONF_PREFIX_PLUGINS"/%s/hidden"
typedef struct _TotemPluginsEnginePrivate{
PeasExtensionSet *activatable_extensions;
@@ -86,27 +85,6 @@ totem_plugins_engine_class_init (TotemPluginsEngineClass *klass)
g_type_class_add_private (klass, sizeof (TotemPluginsEnginePrivate));
}
-static gboolean
-plugin_is_builtin (PeasPluginInfo *info)
-{
- const GHashTable *keys;
- const GValue *value;
- gboolean builtin;
-
- keys = peas_plugin_info_get_keys (info);
- if (keys == NULL)
- return FALSE;
- value = g_hash_table_lookup ((GHashTable *) keys, "Builtin");
- if (value == NULL)
- return FALSE;
-
- builtin = g_value_get_boolean (value);
- if (builtin != FALSE)
- peas_plugin_info_set_visible (info, FALSE);
-
- return builtin;
-}
-
static void
totem_plugins_engine_load_all (TotemPluginsEngine *engine)
{
@@ -124,7 +102,7 @@ totem_plugins_engine_load_all (TotemPluginsEngine *engine)
g_message ("checking peas_plugin_info_get_module_name (info) %s", peas_plugin_info_get_module_name (info));
/* Builtin plugins are activated by default; other plugins aren't */
- if (plugin_is_builtin (info)) {
+ if (peas_plugin_info_is_builtin (info)) {
g_ptr_array_add (activate, (gpointer) peas_plugin_info_get_module_name (info));
g_message ("peas_plugin_info_get_module_name (info) %s, to activate", peas_plugin_info_get_module_name (info));
continue;
@@ -135,11 +113,6 @@ totem_plugins_engine_load_all (TotemPluginsEngine *engine)
g_ptr_array_add (activate, (gpointer) peas_plugin_info_get_module_name (info));
}
g_free (key_name);
-
- key_name = g_strdup_printf (GCONF_PLUGIN_HIDDEN, peas_plugin_info_get_module_name (info));
- if (gconf_client_get_bool (engine->priv->client, key_name, NULL) != FALSE)
- peas_plugin_info_set_visible (info, FALSE);
- g_free (key_name);
}
g_ptr_array_add (activate, NULL);
@@ -166,7 +139,7 @@ on_activatable_extension_added (PeasExtensionSet *set,
{
g_message ("on_activatable_extension_added");
if (peas_extension_call (exten, "activate", engine->priv->totem)) {
- if (peas_plugin_info_get_visible (info)) {
+ if (peas_plugin_info_is_builtin (info) == FALSE) {
char *key_name;
key_name = g_strdup_printf (GCONF_PLUGIN_ACTIVE,
@@ -185,7 +158,7 @@ on_activatable_extension_removed (PeasExtensionSet *set,
g_message ("on_activatable_extension_removed");
peas_extension_call (exten, "deactivate", engine->priv->totem);
- if (peas_plugin_info_get_visible (info)) {
+ if (peas_plugin_info_is_builtin (info) == FALSE) {
char *key_name;
key_name = g_strdup_printf (GCONF_PLUGIN_ACTIVE,
@@ -329,8 +302,6 @@ totem_plugins_engine_gconf_cb (GConfClient *gconf_client,
} else {
peas_engine_unload_plugin (PEAS_ENGINE (engine), info);
}
- } else if (g_str_equal (action_name, "hidden") != FALSE) {
- peas_plugin_info_set_visible (info, !gconf_value_get_bool (entry->value));
}
g_free (action_name);
--
cgit v0.8.3.1

41
totem.spec
View File

@ -1,30 +1,15 @@
# coherence_upnp currently fails to build in rawhide with:
# configure: WARNING: the coherence_upnp plugin uses PyGTK and conflicts with the new pygobject bindings (disabling plugin)
#
# Disable the subpackage for now:
#
%global with_coherence_upnp 0
Summary: Movie player for GNOME
Name: totem
Version: 2.90.5
Release: 8%{?dist}
Version: 2.91.0
Release: 1%{?dist}
Epoch: 1
License: GPLv2+ with exceptions
Group: Applications/Multimedia
URL: http://projects.gnome.org/totem/
Source0: http://download.gnome.org/sources/totem/2.90/totem-%{version}.tar.bz2
# totem does not build against libpeas-devel-0.5.3
# missing symbols: peas_plugin_info_{s|g}et_visible
# Cherrypick fix from totem upstream commit:
# http://git.gnome.org/browse/totem/commit/?id=c73bd203eed8b8d1cb45f8746a988d8cda0d408d
# rhbz#618791
Patch0: fix-libpeas-0.5.3-api-changes.patch
Requires(pre): GConf2
Requires(preun): GConf2
Requires(pre): GConf2
Requires(preun): GConf2
Requires(post): GConf2
Requires: iso-codes
@ -38,7 +23,7 @@ Requires: python-httplib2
Requires: python-BeautifulSoup
Requires: python-feedparser
Requires: gstreamer
Requires: gstreamer
Requires: gstreamer-plugins-base
Requires: gstreamer-plugins-good
Requires: gstreamer-plugins-bad-free
@ -137,7 +122,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
This package provides a plugin to allow browsing the Jamendo music store
in Totem, and listening to them.
%if 0%{with_coherence_upnp}
%package upnp
Summary: UPNP/DLNA plugin for Totem
Group: Applications/Multimedia
@ -147,7 +131,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
%description upnp
This package provides a plugin to allow browsing UPNP/DLNA shares,
and watching videos from those.
%endif
#%package tracker
#Summary: Tracker-based video search plugin for Totem
@ -267,10 +250,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%preun mythtv
%gconf_schema_remove totem-mythtv
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%post mythtv
%gconf_schema_upgrade totem-mythtv
%postun
glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README TODO
@ -303,13 +290,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/totem/plugins/opensubtitles
%{_libdir}/totem/plugins/pythonconsole
%{_libdir}/totem/plugins/screenshot
#%{_libdir}/totem/plugins/bemused
%{_datadir}/icons/hicolor/*/apps/totem.png
%{_datadir}/icons/hicolor/*/devices/totem-tv.png
%{_datadir}/icons/hicolor/scalable/apps/totem.svg
%{_datadir}/icons/hicolor/scalable/devices/totem-tv.svg
%{_mandir}/man1/%{name}.1*
%{_mandir}/man1/totem-video-thumbnailer.1.gz
%{_datadir}/GConf/gsettings/*.convert
%{_datadir}/glib-2.0/schemas/*.xml
%files nautilus
%defattr(-, root, root,-)
@ -331,11 +319,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%defattr(-, root, root,-)
%{_libdir}/totem/plugins/jamendo
%if 0%{with_coherence_upnp}
%files upnp
%defattr(-, root, root,-)
%{_libdir}/totem/plugins/coherence_upnp
%endif
#%{_libdir}/totem/plugins/coherence_upnp
%files devel
%defattr(-, root, root,-)
@ -359,6 +345,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/totem/plugins/publish
%changelog
* Tue Nov 02 2010 Bastien Nocera <bnocera@redhat.com> 2.91.0-1
- Update to 2.91.0
* Fri Sep 24 2010 Parag Nemade <paragn AT fedoraproject.org> 2.90.5-8
- Merge-review cleanup (#226500)