From 3d9baa9e2c3454eb2c318bf61407dfee01304421 Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 1 Sep 2015 12:20:20 +0100 Subject: [PATCH] Update to 3.16.4 --- 0001-Don-t-destroy-attached-menus.patch | 44 ------------------------- file-roller.spec | 11 +++---- sources | 2 +- 3 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 0001-Don-t-destroy-attached-menus.patch diff --git a/0001-Don-t-destroy-attached-menus.patch b/0001-Don-t-destroy-attached-menus.patch deleted file mode 100644 index c8f0beb..0000000 --- a/0001-Don-t-destroy-attached-menus.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 370756f9a6334d87b98cebc395962712657e595a Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Fri, 21 Aug 2015 17:53:36 -0400 -Subject: [PATCH] Don't destroy attached menus - -The documentation for gtk_menu_attach_to_widget states that -attached menus are destroyed together with their attach_widget, -like child widgets. Destroying them manually leads to bad things, -such as segfaults. - -https://bugzilla.gnome.org/show_bug.cgi?id=753951 ---- - src/fr-window.c | 15 --------------- - 1 file changed, 15 deletions(-) - -diff --git a/src/fr-window.c b/src/fr-window.c -index d27e00f..b9f128f 100644 ---- a/src/fr-window.c -+++ b/src/fr-window.c -@@ -540,21 +540,6 @@ fr_window_free_private_data (FrWindow *window) - _g_string_list_free (window->priv->drag_file_list); - window->priv->drag_file_list = NULL; - -- if (window->priv->file_popup_menu != NULL) { -- gtk_widget_destroy (window->priv->file_popup_menu); -- window->priv->file_popup_menu = NULL; -- } -- -- if (window->priv->folder_popup_menu != NULL) { -- gtk_widget_destroy (window->priv->folder_popup_menu); -- window->priv->folder_popup_menu = NULL; -- } -- -- if (window->priv->sidebar_folder_popup_menu != NULL) { -- gtk_widget_destroy (window->priv->sidebar_folder_popup_menu); -- window->priv->sidebar_folder_popup_menu = NULL; -- } -- - g_free (window->priv->last_location); - - fr_window_free_batch_data (window); --- -2.5.0 - diff --git a/file-roller.spec b/file-roller.spec index 01e886f..c0c5610 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,16 +1,13 @@ Summary: Tool for viewing and creating archives Name: file-roller -Version: 3.16.3 -Release: 2%{?dist} +Version: 3.16.4 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Archiving URL: https://wiki.gnome.org/Apps/FileRoller #VCS: git:git://git.gnome.org/file-roller Source: https://download.gnome.org/sources/%{name}/3.16/%{name}-%{version}.tar.xz -# https://bugzilla.gnome.org/show_bug.cgi?id=753951 -Patch0: 0001-Don-t-destroy-attached-menus.patch - BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(json-glib-1.0) @@ -47,7 +44,6 @@ or directories. %prep %setup -q -%patch0 -p1 %build %configure \ @@ -105,6 +101,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Sep 01 2015 David King - 3.16.4-1 +- Update to 3.16.4 + * Fri Aug 21 2015 Matthias Clasen - 3.16.3-2 - Fix a crash on shutdown (#1251755) - Rely on file triggers for some things diff --git a/sources b/sources index 305d94d..380d7a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -407b976f0b7fb6fd4c7ce43967c309e1 file-roller-3.16.3.tar.xz +a704c852134041de81f50a3eeec31d50 file-roller-3.16.4.tar.xz