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

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

Browse Source
This commit is contained in:
Alexei Sorokin 2015-10-22 00:11:05 +00:00 committed by Git OBS Bridge
parent 3f9d0e99f6
commit 3be1e19656
4 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nemo-2.4.0-void-return-no-return.patch
View File

@ -1,24 +0,0 @@
Index: nemo-2.4.0/libnemo-private/nemo-monitor.c
===================================================================
--- nemo-2.4.0.orig/libnemo-private/nemo-monitor.c
+++ nemo-2.4.0/libnemo-private/nemo-monitor.c
@@ -78,6 +78,7 @@ schedule_call_consume_changes (void)
call_consume_changes_idle_id =
g_idle_add (call_consume_changes_idle_cb, NULL);
}
+ return 0;
}
static void
Index: nemo-2.4.0/libnemo-private/nemo-action.c
===================================================================
--- nemo-2.4.0.orig/libnemo-private/nemo-action.c
+++ nemo-2.4.0/libnemo-private/nemo-action.c
@@ -1240,6 +1240,7 @@ try_vector (const gchar *op, gint vector
} else if (g_strcmp0 (op, GREATER_THAN) == 0) {
return (vector > 0);
}
+ return 0;
}
static gboolean

20
nemo-2.8.0-void-return-no-return.patch Normal file
View File

@ -0,0 +1,20 @@
--- a/libnemo-private/nemo-action.c
+++ b/libnemo-private/nemo-action.c
@@ -1307,6 +1307,7 @@ check_gsettings_condition (NemoAction *a
g_strfreev (split);
return FALSE;
}
+ return 0;
}
static gboolean
--- a/libnemo-private/nemo-monitor.c
+++ b/libnemo-private/nemo-monitor.c
@@ -78,6 +78,7 @@ schedule_call_consume_changes (void)
call_consume_changes_idle_id =
g_idle_add (call_consume_changes_idle_cb, NULL);
}
+ return 0;
}
static void

2
nemo.changes
View File

@ -41,6 +41,8 @@ Wed Oct 21 14:05:01 UTC 2015 - sor.alexei@meowr.ru
* Re-add revealer animation on search bar.
* Fix Query Editor Row not displaying.
- Fix dependencies.
- Rename and rebase nemo-2.4.0-void-return-no-return.patch to
nemo-2.8.0-void-return-no-return.patch
- Some cleanup.
-------------------------------------------------------------------

4
nemo.spec
View File

@ -29,8 +29,8 @@ Url: https://github.com/linuxmint/nemo
Source: https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM nemo-implicit-pointer-decl.patch marguerite@opensuse.org -- OBS gcc checks.
Patch1: %{name}-implicit-pointer-decl.patch
# PATCH-FIX-UPSTREAM nemo-2.4.0-void-return-no-return.patch margueirte@opensuse.org -- Fix OBS gcc checks.
Patch2: %{name}-2.4.0-void-return-no-return.patch
# 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
BuildRequires: fdupes
BuildRequires: gnome-common
BuildRequires: gtk-doc