rpm/nemo
SHA256
1
0
Fork 0
forked from pool/nemo
Code Pull Requests Activity

- Update to 2.8.1.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo?expand=0&rev=79
This commit is contained in:
Alexei Sorokin 2015-10-27 11:47:16 +00:00 committed by Git OBS Bridge
parent 64bdedb507
commit c0a9a7efb9
5 changed files with 14 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nemo-2.8.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f22687b1556d328c9300aacb3bbd5b4b0a491221dacd979c421b96df85b51189
size 1403852

110
nemo-statusbar-size.patch
View File

@ -1,110 +0,0 @@
--- a/libnemo-extension/nemo-simple-button.c
+++ b/libnemo-extension/nemo-simple-button.c
@@ -41,26 +41,30 @@ NemoSimpleButton *
nemo_simple_button_new_from_icon_name (const gchar *icon_name, int icon_size)
{
GtkWidget *w, *image;
+ GtkIconInfo *icon_info;
+ GdkRGBA colour;
+
+ gdk_rgba_parse (&colour, "rgba(0.0,0.0,0.0,1.0)");
w = g_object_new (NEMO_TYPE_SIMPLE_BUTTON, NULL);
- image = gtk_image_new_from_icon_name (icon_name, icon_size);
+ icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (),
+ icon_name, icon_size,
+ GTK_ICON_LOOKUP_FORCE_SIZE);
+ image = gtk_image_new_from_pixbuf (gtk_icon_info_load_symbolic (
+ icon_info, &colour,
+ NULL, NULL, NULL, NULL, NULL));
+
gtk_button_set_image (GTK_BUTTON (w), image);
return NEMO_SIMPLE_BUTTON (w);
}
+/* Deprecated since Gtk 3.10. */
NemoSimpleButton *
nemo_simple_button_new_from_stock (const gchar *stock_id, int icon_size)
{
- GtkWidget *w, *image;
-
- w = g_object_new (NEMO_TYPE_SIMPLE_BUTTON, NULL);
-
- image = gtk_image_new_from_stock (stock_id, icon_size);
- gtk_button_set_image (GTK_BUTTON (w), image);
-
- return NEMO_SIMPLE_BUTTON (w);
+ return nemo_simple_button_new_from_icon_name(stock_id, icon_size);
}
NemoSimpleButton *
--- a/src/nemo-statusbar.c
+++ b/src/nemo-statusbar.c
@@ -186,16 +186,24 @@ nemo_status_bar_constructed (GObject *ob
bar->real_statusbar = statusbar;
- GtkIconSize size = gtk_icon_size_from_name (NEMO_STATUSBAR_ICON_SIZE_NAME);
+ gint size = 16; /* Unscaled size. */
context = gtk_widget_get_style_context (GTK_WIDGET (bar));
gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOOLBAR);
gtk_container_set_border_width (GTK_CONTAINER (bar), 2);
GtkWidget *button, *icon;
+ GtkIconInfo *icon_info;
+ GdkRGBA colour;
+
+ gdk_rgba_parse (&colour, "rgba(0.0,0.0,0.0,1.0)");
button = gtk_toggle_button_new ();
- icon = gtk_image_new_from_icon_name ("sidebar-places-symbolic", size);
+ icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (),
+ "sidebar-places-symbolic", size,
+ GTK_ICON_LOOKUP_FORCE_SIZE);
+ icon = gtk_image_new_from_pixbuf (gtk_icon_info_load_symbolic (icon_info,
+ &colour, NULL, NULL, NULL, NULL, NULL));
gtk_button_set_image (GTK_BUTTON (button), icon);
gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("Show Places"));
bar->places_button = button;
@@ -204,7 +212,11 @@ nemo_status_bar_constructed (GObject *ob
G_CALLBACK (action_places_toggle_callback), bar);
button = gtk_toggle_button_new ();
- icon = gtk_image_new_from_icon_name ("sidebar-tree-symbolic", size);
+ icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (),
+ "sidebar-tree-symbolic", size,
+ GTK_ICON_LOOKUP_FORCE_SIZE);
+ icon = gtk_image_new_from_pixbuf (gtk_icon_info_load_symbolic (icon_info,
+ &colour, NULL, NULL, NULL, NULL, NULL));
gtk_button_set_image (GTK_BUTTON (button), icon);
gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("Show Treeview"));
bar->tree_button = button;
@@ -218,7 +230,11 @@ nemo_status_bar_constructed (GObject *ob
bar->separator = sep;
button = gtk_button_new ();
- icon = gtk_image_new_from_icon_name ("sidebar-hide-symbolic", size);
+ icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (),
+ "sidebar-hide-symbolic", size,
+ GTK_ICON_LOOKUP_FORCE_SIZE);
+ icon = gtk_image_new_from_pixbuf (gtk_icon_info_load_symbolic (icon_info,
+ &colour, NULL, NULL, NULL, NULL, NULL));
gtk_button_set_image (GTK_BUTTON (button), icon);
gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("Hide the Sidebar (F9)"));
bar->hide_button = button;
@@ -227,7 +243,11 @@ nemo_status_bar_constructed (GObject *ob
G_CALLBACK (action_hide_sidebar_callback), bar);
button = gtk_button_new ();
- icon = gtk_image_new_from_icon_name ("sidebar-show-symbolic", size);
+ icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (),
+ "sidebar-show-symbolic", size,
+ GTK_ICON_LOOKUP_FORCE_SIZE);
+ icon = gtk_image_new_from_pixbuf (gtk_icon_info_load_symbolic (icon_info,
+ &colour, NULL, NULL, NULL, NULL, NULL));
gtk_button_set_image (GTK_BUTTON (button), icon);
gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("Show the Sidebar (F9)"));
bar->show_button = button;

0
nemo-2.8.0-void-return-no-return.patch → nemo-void-return-no-return.patch
View File

15
nemo.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Oct 27 11:21:31 UTC 2015 - sor.alexei@meowr.ru
- Update to 2.8.1:
* nemo-list-view.c: Fix editable not being destroyed after a
canceled rename in certain instances. This would cause the
action bindings for cut/copy not to be released from the text
entry box, breaking cut/copy/paste until Nemo is restarted.
* src/nemo-extension-config-widget.c: Make "No extensions found"
un-clickable like the other two lists.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 21 14:05:01 UTC 2015 - sor.alexei@meowr.ru Wed Oct 21 14:05:01 UTC 2015 - sor.alexei@meowr.ru
@ -42,9 +53,7 @@ Wed Oct 21 14:05:01 UTC 2015 - sor.alexei@meowr.ru
* Fix Query Editor Row not displaying. * Fix Query Editor Row not displaying.
- Fix dependencies. - Fix dependencies.
- Rename and rebase nemo-2.4.0-void-return-no-return.patch to - Rename and rebase nemo-2.4.0-void-return-no-return.patch to
nemo-2.8.0-void-return-no-return.patch nemo-void-return-no-return.patch.
- Add nemo-statusbar-size.patch: make statusbar small despite what
icon theme may default for scalables.
- Some cleanup. - Some cleanup.
------------------------------------------------------------------- -------------------------------------------------------------------

7
nemo.spec
View File

@ -20,7 +20,7 @@
%define sover 1 %define sover 1
%define typelib typelib-1_0-Nemo-3_0 %define typelib typelib-1_0-Nemo-3_0
Name: nemo Name: nemo
Version: 2.8.0 Version: 2.8.1
Release: 0 Release: 0
Summary: File browser for Cinnamon Summary: File browser for Cinnamon
License: GPL-2.0+ License: GPL-2.0+
@ -30,9 +30,7 @@ Source: https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-
# PATCH-FIX-UPSTREAM nemo-implicit-pointer-decl.patch marguerite@opensuse.org -- OBS gcc checks. # PATCH-FIX-UPSTREAM nemo-implicit-pointer-decl.patch marguerite@opensuse.org -- OBS gcc checks.
Patch1: %{name}-implicit-pointer-decl.patch Patch1: %{name}-implicit-pointer-decl.patch
# PATCH-FIX-UPSTREAM nemo-2.8.0-void-return-no-return.patch margueirte@opensuse.org -- Fix OBS gcc checks. # PATCH-FIX-UPSTREAM nemo-2.8.0-void-return-no-return.patch margueirte@opensuse.org -- Fix OBS gcc checks.
Patch2: %{name}-2.8.0-void-return-no-return.patch Patch2: %{name}-void-return-no-return.patch
# PATCH-FIX-OPENSUSE nemo-statusbar-size.patch sor.alexei@meowr.ru -- Make statusbar small despite what icon theme may default for scalables.
Patch3: %{name}-statusbar-size.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: gtk-doc BuildRequires: gtk-doc
@ -109,7 +107,6 @@ This package provides the GObject Introspection bindings for Nemo.
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
NOCONFIGURE=1 gnome-autogen.sh NOCONFIGURE=1 gnome-autogen.sh