diff --git a/nautilus-2.29.92.1.tar.bz2 b/nautilus-2.29.92.1.tar.bz2 new file mode 100644 index 0000000..739df1b --- /dev/null +++ b/nautilus-2.29.92.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f68c83f3f8961b38218667bf6cd6c14e2da0631bf7624585b872aec56805d47f +size 6178814 diff --git a/nautilus-2.29.92.tar.bz2 b/nautilus-2.29.92.tar.bz2 deleted file mode 100644 index e27da48..0000000 --- a/nautilus-2.29.92.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ddd9b02f532f714b288c0bd440fb67e66334514d6484653560cc4eed3f271093 -size 6178764 diff --git a/nautilus-gtk2.19.7.patch b/nautilus-gtk2.19.7.patch deleted file mode 100644 index a6d3f69..0000000 --- a/nautilus-gtk2.19.7.patch +++ /dev/null @@ -1,87 +0,0 @@ -Index: nautilus-2.29.92/eel/eel-editable-label.c -=================================================================== ---- nautilus-2.29.92.orig/eel/eel-editable-label.c -+++ nautilus-2.29.92/eel/eel-editable-label.c -@@ -1173,7 +1173,7 @@ eel_editable_label_style_set (GtkWidget - */ - if (GTK_WIDGET_REALIZED (widget)) - { -- gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]); -+ gdk_window_set_background (widget->window, &widget->style->base[gtk_widget_get_state (widget)]); - - if (label->primary_cursor_gc != NULL) - { -@@ -1625,7 +1625,7 @@ eel_editable_label_expose (GtkWidget - - gtk_paint_layout (widget->style, - widget->window, -- GTK_WIDGET_STATE (widget), -+ gtk_widget_get_state (widget), - TRUE, - &event->area, - widget, -@@ -1689,7 +1689,7 @@ eel_editable_label_expose (GtkWidget - - if (label->draw_outline) - gdk_draw_rectangle (widget->window, -- widget->style->text_gc [GTK_WIDGET_STATE (widget)], -+ widget->style->text_gc [gtk_widget_get_state (widget)], - FALSE, - 0, 0, - widget->allocation.width - 1, -@@ -1740,7 +1740,7 @@ eel_editable_label_realize (GtkWidget *w - - widget->style = gtk_style_attach (widget->style, widget->window); - -- gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]); -+ gdk_window_set_background (widget->window, &widget->style->base[gtk_widget_get_state (widget)]); - - gtk_im_context_set_client_window (label->im_context, widget->window); - -Index: nautilus-2.29.92/eel/eel-gtk-extensions.c -=================================================================== ---- nautilus-2.29.92.orig/eel/eel-gtk-extensions.c -+++ nautilus-2.29.92/eel/eel-gtk-extensions.c -@@ -886,7 +886,7 @@ eel_gtk_label_expose_event (GtkLabel *la - - gtk_paint_layout (widget->style, - widget->window, -- GTK_WIDGET_STATE (widget), -+ gtk_widget_get_state (widget), - FALSE, - &event->area, - widget, -Index: nautilus-2.29.92/eel/eel-labeled-image.c -=================================================================== ---- nautilus-2.29.92.orig/eel/eel-labeled-image.c -+++ nautilus-2.29.92/eel/eel-labeled-image.c -@@ -540,13 +540,13 @@ eel_labeled_image_expose_event (GtkWidge - - labeled_image = EEL_LABELED_IMAGE (widget); - -- if (GTK_WIDGET_STATE (widget) == GTK_STATE_SELECTED || -- GTK_WIDGET_STATE (widget) == GTK_STATE_ACTIVE) { -+ if (gtk_widget_get_state (widget) == GTK_STATE_SELECTED || -+ gtk_widget_get_state (widget) == GTK_STATE_ACTIVE) { - label_bounds = eel_labeled_image_get_label_bounds (EEL_LABELED_IMAGE (widget)); - - gtk_paint_flat_box (widget->style, - widget->window, -- GTK_WIDGET_STATE (widget), -+ gtk_widget_get_state (widget), - GTK_SHADOW_NONE, - &event->area, - widget, -Index: nautilus-2.29.92/libnautilus-private/nautilus-tree-view-drag-dest.c -=================================================================== ---- nautilus-2.29.92.orig/libnautilus-private/nautilus-tree-view-drag-dest.c -+++ nautilus-2.29.92/libnautilus-private/nautilus-tree-view-drag-dest.c -@@ -189,7 +189,7 @@ highlight_expose (GtkWidget *widget, - - gtk_paint_focus (widget->style, - bin_window, -- GTK_WIDGET_STATE (widget), -+ gtk_widget_get_state (widget), - NULL, - widget, - "treeview-drop-indicator", diff --git a/nautilus.changes b/nautilus.changes index d9545f4..907bd82 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Mar 12 12:15:22 CET 2010 - dimstar@opensuse.org + +- Update to version 2.29.92.1: + + Fix compilation due to deprecated GTK_WIDGET_STATE symbol + + Fix libm linking + + Updated translations. +- Drop nautilus-gtk2.19.7.patch, fixed upstream. + ------------------------------------------------------------------- Mon Mar 8 17:27:26 CET 2010 - dimstar@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 632cb2b..0a3e6f3 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,5 +1,5 @@ # -# spec file for package nautilus (Version 2.29.92) +# spec file for package nautilus (Version 2.29.92.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -35,7 +35,7 @@ BuildRequires: translation-update-upstream BuildRequires: update-desktop-files License: GPLv2+ Group: Productivity/File utilities -Version: 2.29.92 +Version: 2.29.92.1 Release: 1 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 @@ -54,8 +54,6 @@ Patch15: nautilus-drives-and-volumes-on-desktop.diff Patch20: nautilus-bnc363122-lockdown-context-menus.diff # PATCH-NEEDS-REBASE nautilus-sysadmin-desktop-items.diff fate305252 federico@novell.com -- Support sysadmin-defined desktop items (was PATCH-FEATURE-OPENSUSE) Patch21: nautilus-sysadmin-desktop-items.diff -# PATCH-FIX-UPSTREAM nautilus-gtk2.19.7.patch bgo#612423 dimstar@opensuse.org -- do not use deprecated symbols -Patch22: nautilus-gtk2.19.7.patch Requires: %{name}-lang = %{version} Requires: gvfs # So that symlinks to icons work: @@ -95,7 +93,6 @@ gnome-patch-translation-prepare ### %patch15 -p1 %patch20 -p1 #%patch21 -p1 -%patch22 -p1 gnome-patch-translation-update %build