Accepting request 230894 from home:MargueriteSu:branches:X11:Cinnamon:Factory
OBS-URL: https://build.opensuse.org/request/show/230894 OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo?expand=0&rev=58
This commit is contained in:
parent
dfc0f2fc69
commit
1f04d413fc
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e061bd231493737e64c05448bbab29dcd34a0bcc37f0d6240b5f08109e92dbf0
|
||||
size 1341780
|
32
nemo-2.2.0-void-return-no-return.patch
Normal file
32
nemo-2.2.0-void-return-no-return.patch
Normal file
@ -0,0 +1,32 @@
|
||||
Index: nemo-2.2.0/libnemo-private/nemo-action.c
|
||||
===================================================================
|
||||
--- nemo-2.2.0.orig/libnemo-private/nemo-action.c
|
||||
+++ nemo-2.2.0/libnemo-private/nemo-action.c
|
||||
@@ -1085,7 +1085,7 @@ nemo_action_get_label (NemoAction *actio
|
||||
const gchar *orig_label = nemo_action_get_orig_label (action);
|
||||
|
||||
if (orig_label == NULL)
|
||||
- return;
|
||||
+ return NULL;
|
||||
|
||||
action->escape_underscores = TRUE;
|
||||
|
||||
@@ -1352,4 +1352,4 @@ nemo_action_get_visibility (NemoAction *
|
||||
out:
|
||||
|
||||
return selection_type_show && extension_type_show && condition_type_show;
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
Index: nemo-2.2.0/libnemo-private/nemo-monitor.c
|
||||
===================================================================
|
||||
--- nemo-2.2.0.orig/libnemo-private/nemo-monitor.c
|
||||
+++ nemo-2.2.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
|
3
nemo-2.2.0.tar.gz
Normal file
3
nemo-2.2.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7740272c8d20e90f54171dc40487237f825c314f080ca2698bc9b3f70d285af0
|
||||
size 1387586
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 20 11:04:26 UTC 2014 - i@marguerite.su
|
||||
|
||||
- update version 2.2.0
|
||||
- add patch: nemo-2.2.0-void-return-no-return.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 26 13:31:02 UTC 2013 - johann.luce@wanadoo.fr
|
||||
|
||||
|
11
nemo.spec
11
nemo.spec
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
Name: nemo
|
||||
Version: 2.0.8
|
||||
Version: 2.2.0
|
||||
Release: 0
|
||||
License: GPL-2.0+ and LGPL-2.0
|
||||
Summary: File browser for Cinnamon
|
||||
@ -27,10 +27,14 @@ Group: System/GUI/Other
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM marguerite@opensuse.org fix OBS gcc checks
|
||||
Patch1: nemo-2.0.1-view-no-return.patch
|
||||
# PATCH-FIX-UPSTREAM margueirte@opensuse.org fix OBS gcc checks
|
||||
Patch2: nemo-2.2.0-void-return-no-return.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: python-polib
|
||||
BuildRequires: python-gobject-devel
|
||||
BuildRequires: shared-mime-info
|
||||
BuildRequires: tracker-devel
|
||||
BuildRequires: update-desktop-files
|
||||
@ -89,8 +93,7 @@ This package provides the GObject Introspection bindings for Nemo.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%if 0%{?suse_version} > 1230
|
||||
%endif
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
|
||||
@ -105,7 +108,7 @@ make %{?_smp_mflags}
|
||||
%make_install
|
||||
find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete
|
||||
|
||||
%suse_update_desktop_file %{name}
|
||||
%suse_update_desktop_file %{name} System FileManager
|
||||
%suse_update_desktop_file %{name}-autostart
|
||||
%suse_update_desktop_file %{name}-autorun-software
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user