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

Accepting request 260067 from home:MargueriteSu:branches:X11:Cinnamon:Factory

Browse Source 
update 2.4.0

OBS-URL: https://build.opensuse.org/request/show/260067
OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo?expand=0&rev=64
This commit is contained in:
Marguerite Su 2014-11-06 13:42:22 +00:00 committed by Git OBS Bridge
parent 6afa9988d0
commit 8bd5f37ac5
9 changed files with 77 additions and 2093 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nemo-2.0.1-view-no-return.patch
View File

@ -1,12 +0,0 @@
Index: nemo-2.0.1/src/nemo-view.c
===================================================================
--- nemo-2.0.1.orig/src/nemo-view.c
+++ nemo-2.0.1/src/nemo-view.c
@@ -700,6 +700,7 @@ nemo_view_get_default_zoom_level (NemoVi
}
NEMO_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_default_zoom_level (view);
+ return 0;
}
const char *

32
nemo-2.2.0-void-return-no-return.patch
View File

@ -1,32 +0,0 @@
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

2012
nemo-2.3.0-revert-hidpi-support.patch
View File

File diff suppressed because it is too large Load Diff

3
nemo-2.3.0.tar.gz
View File

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

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

@ -0,0 +1,24 @@
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

3
nemo-2.4.0.tar.gz Normal file
View File

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

12
nemo-implicit-pointer-decl.patch Normal file
View File

@ -0,0 +1,12 @@
Index: nemo-2.4.0/libnemo-private/nemo-widget-menu-item.c
===================================================================
--- nemo-2.4.0.orig/libnemo-private/nemo-widget-menu-item.c
+++ nemo-2.4.0/libnemo-private/nemo-widget-menu-item.c
@@ -17,6 +17,7 @@
#include "nemo-widget-menu-item.h"
#include "nemo-widget-action.h"
+#include <string.h>
enum {
PROP_0,

9
nemo.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Nov 5 15:55:28 UTC 2014 - i@marguerite.su
- update version 2.4.0
- drop support for openSUSE 12.3 which will be EOL soon
- drop patch: nemo-2.3.0-revert-hidpi-support.patch
- add patch: nemo-implicit-pointer-decl.patch
* use strcmp without including string.h
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 12 07:05:52 UTC 2014 - i@marguerite.su Tue Aug 12 07:05:52 UTC 2014 - i@marguerite.su

63
nemo.spec
View File

@ -1,8 +1,7 @@
# #
# spec file for package nemo # spec file for package nemo
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) Nelson Marques <nmo.marques@gmail.com>
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,47 +16,45 @@
# #
Name: nemo Name: nemo
Version: 2.3.0 Version: 2.4.0
Release: 0 Release: 0
License: GPL-2.0+ and LGPL-2.0
Summary: File browser for Cinnamon Summary: File browser for Cinnamon
Url: http://github.com/linuxmint/nemo License: GPL-2.0+ and LGPL-2.0
Group: System/GUI/Other Group: System/GUI/Other
Url: http://github.com/linuxmint/nemo
Source: %{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM marguerite@opensuse.org fix OBS gcc checks # PATCH-FIX-UPSTREAM marguerite@opensuse.org OBS gcc checks
Patch1: nemo-2.0.1-view-no-return.patch Patch1: nemo-implicit-pointer-decl.patch
# PATCH-FIX-UPSTREAM margueirte@opensuse.org fix OBS gcc checks # PATCH-FIX-UPSTREAM margueirte@opensuse.org fix OBS gcc checks
Patch2: nemo-2.2.0-void-return-no-return.patch Patch2: nemo-2.4.0-void-return-no-return.patch
# PATCH-FIX-OPENSUSE marguerite@opensuse.org revert Hi-DPI support for 12.3 BuildRequires: fdupes
Patch3: nemo-2.3.0-revert-hidpi-support.patch
BuildRequires: fdupes
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: python-polib BuildRequires: python-gobject-devel
BuildRequires: python-gobject-devel BuildRequires: python-polib
BuildRequires: shared-mime-info BuildRequires: shared-mime-info
BuildRequires: tracker-devel BuildRequires: tracker-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: pkgconfig(cinnamon-desktop) BuildRequires: pkgconfig(cinnamon-desktop)
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(exempi-2.0)
BuildRequires: pkgconfig(gail-3.0) BuildRequires: pkgconfig(gail-3.0)
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(gtksourceview-2.0) BuildRequires: pkgconfig(gtksourceview-2.0)
BuildRequires: pkgconfig(gtksourceview-3.0) BuildRequires: pkgconfig(gtksourceview-3.0)
BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(polkit-agent-1) BuildRequires: pkgconfig(polkit-agent-1)
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
Recommends: cinnamon-translations Recommends: cinnamon-translations
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%glib2_gsettings_schema_requires %{glib2_gsettings_schema_requires}
%description %description
Nemo is the file manager for the Cinnamon desktop environment. Nemo is the file manager for the Cinnamon desktop environment.
@ -66,7 +63,7 @@ Nemo is the file manager for the Cinnamon desktop environment.
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries/Other Group: Development/Libraries/Other
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: libnemo-extension1 = %{version} Requires: libnemo-extension1 = %{version}
Requires: typelib-1_0-Nemo-3_0 = %{version} Requires: typelib-1_0-Nemo-3_0 = %{version}
%description devel %description devel
@ -96,9 +93,6 @@ This package provides the GObject Introspection bindings for Nemo.
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%if 0%{?suse_version} <= 1230
%patch3 -p1
%endif
%build %build
sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
@ -111,7 +105,7 @@ make %{?_smp_mflags}
%install %install
%make_install %make_install
find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete find %{buildroot} -type f -name "*.la" -delete -print
%suse_update_desktop_file %{name} System FileManager %suse_update_desktop_file %{name} System FileManager
%suse_update_desktop_file %{name}-autostart %suse_update_desktop_file %{name}-autostart
@ -125,7 +119,7 @@ mkdir -p %{buildroot}%{_libdir}/nemo/extensions-3.0
%post %post
%icon_theme_cache_post %icon_theme_cache_post
%desktop_database_post %desktop_database_post
%glib2_gsettings_schema_post %{glib2_gsettings_schema_post}
%mime_database_post %mime_database_post
%post -n libnemo-extension1 -p /sbin/ldconfig %post -n libnemo-extension1 -p /sbin/ldconfig
@ -133,7 +127,7 @@ mkdir -p %{buildroot}%{_libdir}/nemo/extensions-3.0
%postun %postun
%icon_theme_cache_postun %icon_theme_cache_postun
%desktop_database_postun %desktop_database_postun
%glib2_gsettings_schema_postun %{glib2_gsettings_schema_postun}
%mime_database_postun %mime_database_postun
%postun -n libnemo-extension1 -p /sbin/ldconfig %postun -n libnemo-extension1 -p /sbin/ldconfig
@ -144,6 +138,7 @@ mkdir -p %{buildroot}%{_libdir}/nemo/extensions-3.0
%{_bindir}/nemo %{_bindir}/nemo
%{_bindir}/nemo-autorun-software %{_bindir}/nemo-autorun-software
%{_bindir}/nemo-connect-server %{_bindir}/nemo-connect-server
%{_bindir}/nemo-open-with
%dir %{_libexecdir}/%{name} %dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/nemo-convert-metadata %{_libexecdir}/%{name}/nemo-convert-metadata
%{_datadir}/applications/nemo.desktop %{_datadir}/applications/nemo.desktop