OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo?expand=0&rev=40

2013-10-27 14:06:52 +00:00 · 2013-10-27 14:06:52 +00:00 · 011aa249ef
commit 011aa249ef
parent 9f0c0edfc4
2 changed files with 134 additions and 3 deletions
--- a/nemo-2.0.1-GTK_STOCK.patch
+++ b/nemo-2.0.1-GTK_STOCK.patch
@ -161,6 +161,15 @@ Index: nemo-2.0.1/libnemo-private/nemo-bookmark.c
 		emblem = g_emblem_new (icon);
 
 		emblemed_icon = g_emblemed_icon_new (folder, emblem);
+@@ -632,7 +632,7 @@ nemo_bookmark_menu_item_new (NemoBookmar
+ 	const char *name;
+ 
+ 	name = nemo_bookmark_get_name (bookmark);
+-	menu_item = gtk_image_menu_item_new_with_label (name);
+	menu_item = gtk_menu_item_new_with_label (name);
+ 	label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (menu_item)));
+ 	gtk_label_set_use_underline (label, FALSE);
+ 	gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
 Index: nemo-2.0.1/libnemo-private/nemo-column-chooser.c
 ===================================================================
 --- nemo-2.0.1.orig/libnemo-private/nemo-column-chooser.c
@ -681,3 +690,127 @@ Index: nemo-2.0.1/src/nemo-tree-sidebar.c
 	g_signal_connect (menu_item, "activate",
 			  G_CALLBACK (fm_tree_view_paste_cb),
 			  view);
+@@ -1394,7 +1389,7 @@ create_popup_menu (FMTreeView *view)
+ 		GTK_WIDGET (eel_gtk_menu_append_separator (GTK_MENU (popup)));
+ 
+ 	/* add the "properties" menu item */
+-	menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PROPERTIES, NULL);
+	menu_item = gtk_image_menu_item_new_from_icon_name ("document-properties", NULL);
+ 	g_signal_connect (menu_item, "activate",
+ 			  G_CALLBACK (fm_tree_view_properties_cb),
+ 			  view);
+Index: nemo-2.0.1/src/nemo-connect-server-dialog.c
+===================================================================
+--- nemo-2.0.1.orig/src/nemo-connect-server-dialog.c
+++ nemo-2.0.1/src/nemo-connect-server-dialog.c
+@@ -204,7 +204,7 @@ connect_dialog_gvfs_error (NemoConnectSe
+ 	gtk_container_add (GTK_CONTAINER (content_area), hbox);
+ 	gtk_widget_show (hbox);
+ 
+-	image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_SMALL_TOOLBAR);
+	image = gtk_image_new_from_icon_name ("dialog-error", GTK_ICON_SIZE_SMALL_TOOLBAR);
+ 	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 6);
+ 	gtk_widget_show (image);
+ 	
+@@ -256,9 +256,9 @@ iconize_entry (NemoConnectServerDialog *
+ 		dialog->details->iconized_entries =
+ 			g_list_prepend (dialog->details->iconized_entries, entry);
+ 
+-		gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
+		gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
+ 					       GTK_ENTRY_ICON_SECONDARY,
+-					       GTK_STOCK_DIALOG_WARNING);
+					       "dialog-warning");
+ 
+ 		gtk_widget_grab_focus (entry);
+ 
+@@ -316,7 +316,7 @@ connect_dialog_set_info_bar_error (NemoC
+ 	gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 6);
+ 	gtk_widget_show (hbox);
+ 
+-	icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
+	icon = gtk_image_new_from_icon_name ("dialog-warning",
+ 					 GTK_ICON_SIZE_SMALL_TOOLBAR);
+ 	gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 6);
+ 	gtk_widget_show (icon);
+@@ -391,7 +391,7 @@ connect_dialog_request_additional_detail
+ 	gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 6);
+ 	gtk_widget_show (hbox);
+ 
+-	icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
+	icon = gtk_image_new_from_icon_name ("dialog-warning",
+ 					 GTK_ICON_SIZE_SMALL_TOOLBAR);
+ 	gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 6);
+ 	gtk_widget_show (icon);
+@@ -1100,10 +1100,10 @@ nemo_connect_server_dialog_init (NemoCon
+ 	bind_visibility (dialog, dialog->details->password_entry, checkbox);
+ 
+         gtk_dialog_add_button (GTK_DIALOG (dialog),
+-                               GTK_STOCK_HELP,
+                               _("_Help"),
+                                GTK_RESPONSE_HELP);
+ 	gtk_dialog_add_button (GTK_DIALOG (dialog),
+-			       GTK_STOCK_CANCEL,
+			       _("_Cancel"),
+ 			       GTK_RESPONSE_CANCEL);
+ 	connect_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
+ 						_("C_onnect"),
+Index: nemo-2.0.1/src/nemo-properties-window.c
+===================================================================
+--- nemo-2.0.1.orig/src/nemo-properties-window.c
+++ nemo-2.0.1/src/nemo-properties-window.c
+@@ -4886,8 +4886,8 @@ create_properties_window (StartupData *s
+ 	append_extension_pages (window);
+ 
+ 	gtk_dialog_add_buttons (GTK_DIALOG (window),
+-				GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+-				GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+				_("_Help"), GTK_RESPONSE_HELP,
+				_("_Close"), GTK_RESPONSE_CLOSE,
+ 				NULL);
+ 
+ 	/* FIXME - HIGificiation, should be done inside GTK+ */
+@@ -5392,9 +5392,9 @@ select_image_button_callback (GtkWidget
+ 	if (dialog == NULL) {
+ 		dialog = gtk_file_chooser_dialog_new (_("Select Custom Icon"), GTK_WINDOW (window),
+ 						      GTK_FILE_CHOOSER_ACTION_OPEN,
+-						      GTK_STOCK_REVERT_TO_SAVED, GTK_RESPONSE_NO,
+-						      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+-						      GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+						      _("_Revert"), GTK_RESPONSE_NO,
+						      _("_Cancel"), GTK_RESPONSE_CANCEL,
+						      _("_Open"), GTK_RESPONSE_OK,
+ 						      NULL);
+ 		gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), "/usr/share/pixmaps", NULL);
+ 		gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
+Index: nemo-2.0.1/src/nemo-window-manage-views.c
+===================================================================
+--- nemo-2.0.1.orig/src/nemo-window-manage-views.c
+++ nemo-2.0.1/src/nemo-window-manage-views.c
+@@ -1149,7 +1149,7 @@ real_setup_loading_floating_bar (NemoWin
+ 	nemo_floating_bar_set_show_spinner (NEMO_FLOATING_BAR (slot->floating_bar),
+ 						TRUE);
+ 	nemo_floating_bar_add_action (NEMO_FLOATING_BAR (slot->floating_bar),
+-					  GTK_STOCK_STOP,
+					  _("_Stop"),
+ 					  NEMO_FLOATING_BAR_ACTION_ID_STOP);
+ 
+ 	gtk_widget_set_halign (slot->floating_bar, GTK_ALIGN_END);
+Index: nemo-2.0.1/src/nemo-window-menus.c
+===================================================================
+--- nemo-2.0.1.orig/src/nemo-window-menus.c
+++ nemo-2.0.1/src/nemo-window-menus.c
+@@ -1036,11 +1036,11 @@ static const GtkActionEntry main_entries
+   /* name, stock id, label */  { "Edit", NULL, N_("_Edit") },
+   /* name, stock id, label */  { "View", NULL, N_("_View") },
+   /* name, stock id, label */  { "Help", NULL, N_("_Help") },
+-  /* name, stock id */         { "Close", GTK_STOCK_CLOSE,
+  /* name, stock id */         { "Close", _("_Close"),
+   /* label, accelerator */       N_("_Close"), "<control>W",
+   /* tooltip */                  N_("Close this folder"),
+                                  G_CALLBACK (action_close_window_slot_callback) },
+-                               { "Preferences", GTK_STOCK_PREFERENCES,
+                               { "Preferences", _("_Preferences"),
+                                  N_("Prefere_nces"),               
+                                  NULL, N_("Edit Nemo preferences"),
+                                  G_CALLBACK (action_preferences_callback) },
--- a/nemo.spec
+++ b/nemo.spec
@ -16,8 +16,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

-# wise detect Tumbleweed
-#%define gnome_common_ver %(rpm -q --qf '%%{VERSION}' gnome-common | sed 's/[^0-9]*3\\.\\([0-9]*\\)\\.[0-9]*/\\1/') 

 Name:		nemo
 Version:        2.0.1
@ -37,7 +35,6 @@ BuildRequires:	fdupes
 BuildRequires:  gnome-common
 BuildRequires:	gtk-doc
 BuildRequires:  hicolor-icon-theme
-BuildRequires:	sed
 BuildRequires:  shared-mime-info
 BuildRequires:	tracker-devel
 BuildRequires:	update-desktop-files
@ -102,6 +99,7 @@ This package provides the GObject Introspection bindings for Nemo.
 %endif

 %build
+sedd -i '/AC_SUBSET(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
 NOCONFIGURE=1 ./autogen.sh
 %configure  --libexecdir=%{_libexecdir}/%{name} \
   --disable-static \