diff --git a/file-roller-3.2.0.tar.bz2 b/file-roller-3.2.0.tar.bz2 deleted file mode 100644 index ab158a1..0000000 --- a/file-roller-3.2.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ae0f0a485cdac96915ce0263a718dd28762be02fde4dd051247e9897a7110cb -size 2151235 diff --git a/file-roller-3.2.1.tar.bz2 b/file-roller-3.2.1.tar.bz2 new file mode 100644 index 0000000..f7f7a55 --- /dev/null +++ b/file-roller-3.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c09fbce4153adfa7c2cd49e8c07baa8366a6d89a6e765201729263b953851a5 +size 2151679 diff --git a/file-roller-no-crash-without-nautilus.patch b/file-roller-no-crash-without-nautilus.patch deleted file mode 100644 index 96aac40..0000000 --- a/file-roller-no-crash-without-nautilus.patch +++ /dev/null @@ -1,69 +0,0 @@ -commit 0b579ad93f99133e6d92af08a36a3d5693edad5f -Author: Vincent Untz -Date: Mon Oct 10 09:12:59 2011 +0200 - - Do not crash if nautilus schema is not present - - A lot of users use file-roller in non-GNOME environments, where nautilus - is not installed. We don't want to crash in that case as we only need - the nautilus schema to determine if we use single-click vs double-click. - - https://bugzilla.gnome.org/show_bug.cgi?id=649094 - -diff --git a/src/fr-window.c b/src/fr-window.c -index 743c8fe..0357b68 100644 ---- a/src/fr-window.c -+++ b/src/fr-window.c -@@ -4642,6 +4642,9 @@ is_single_click_policy (FrWindow *window) - char *value; - gboolean result; - -+ if (!window->priv->settings_nautilus) -+ return FALSE; -+ - value = g_settings_get_string (window->priv->settings_nautilus, NAUTILUS_CLICK_POLICY); - result = (value != NULL) && (strncmp (value, "single", 6) == 0); - g_free (value); -@@ -5425,6 +5428,8 @@ fr_window_construct (FrWindow *window) - GtkToolItem *open_recent_tool_item; - GtkWidget *menu_item; - GError *error = NULL; -+ const char * const *schemas; -+ const char *schema; - - /* data common to all windows. */ - -@@ -5441,7 +5446,15 @@ fr_window_construct (FrWindow *window) - window->priv->settings_ui = g_settings_new (FILE_ROLLER_SCHEMA_UI); - window->priv->settings_general = g_settings_new (FILE_ROLLER_SCHEMA_GENERAL); - window->priv->settings_dialogs = g_settings_new (FILE_ROLLER_SCHEMA_DIALOGS); -- window->priv->settings_nautilus = g_settings_new (NAUTILUS_SCHEMA); -+ -+ /* Only use the nautilus schema if it's installed */ -+ schemas = g_settings_list_schemas(); -+ for (; *schemas != NULL; schemas++) { -+ if (g_strcmp0 (*schemas, NAUTILUS_SCHEMA) == 0) { -+ window->priv->settings_nautilus = g_settings_new (NAUTILUS_SCHEMA); -+ break; -+ } -+ } - - /* Create the application. */ - -@@ -6045,10 +6058,12 @@ fr_window_construct (FrWindow *window) - "changed::" PREF_LISTING_USE_MIME_ICONS, - G_CALLBACK (pref_use_mime_icons_changed), - window); -- g_signal_connect (window->priv->settings_nautilus, -- "changed::" NAUTILUS_CLICK_POLICY, -- G_CALLBACK (pref_click_policy_changed), -- window); -+ -+ if (window->priv->settings_nautilus) -+ g_signal_connect (window->priv->settings_nautilus, -+ "changed::" NAUTILUS_CLICK_POLICY, -+ G_CALLBACK (pref_click_policy_changed), -+ window); - - /* Give focus to the list. */ - diff --git a/file-roller.changes b/file-roller.changes index d16372d..6cc5223 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 17 19:33:30 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.2.1: + + Do not crash if nautilus schema is not present + + Use $(DISABLE_DEPRECATED) in copy-n-paste/Makefile.am +- Drop file-roller-no-crash-without-nautilus.patch: fixed upstream. + ------------------------------------------------------------------- Mon Oct 10 09:08:10 UTC 2011 - vuntz@opensuse.org diff --git a/file-roller.spec b/file-roller.spec index 1a1f62b..2ef6af7 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -18,15 +18,13 @@ Name: file-roller -Version: 3.2.0 +Version: 3.2.1 Release: 1 License: GPLv2+ Summary: An Archive Manager for GNOME Url: http://fileroller.sourceforge.net Group: Productivity/Archiving/Compression Source: http://download.gnome.org/sources/file-roller/3.2/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM file-roller-no-crash-without-nautilus.patch bgo#649094 bnc#722863 vuntz@opensuse.org -- Do not crash if nautilus gsettings schemas are not installed -Patch0: file-roller-no-crash-without-nautilus.patch # Needed for directory ownership BuildRequires: dbus-1 BuildRequires: fdupes @@ -92,7 +90,6 @@ This package contains a plugin to integrate File Roller into Nautilus. %prep %setup -q translation-update-upstream -%patch0 -p1 %build %configure\