rpms/nautilus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 3.5.2

Browse Source
This commit is contained in:
Richard Hughes 2012-06-07 10:00:21 +01:00
parent ffd89e33be
commit e21ab0ee8b
4 changed files with 6 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -39,3 +39,4 @@ nautilus-2.31.6.tar.bz2
/nautilus-3.4.0.tar.xz
/nautilus-3.4.1.tar.xz
/nautilus-3.5.1.tar.xz
/nautilus-3.5.2.tar.xz

9
nautilus.spec
View File

@ -9,7 +9,7 @@
Name: nautilus
Summary: File manager for GNOME
Version: 3.5.1
Version: 3.5.2
Release: 1%{?dist}
License: GPLv2+
Group: User Interface/Desktops
@ -58,9 +58,6 @@ Provides: eel2 = 2.26.0-3
# cleaning up to work with current nautilus git.
#Patch4: nautilus-2.91.8-selinux.patch
# Fixed in upstream commit db0b28fd
Patch7: rtl-fix.patch
%description
Nautilus is the file manager and graphical shell for the GNOME desktop
that makes it easy to manage your files and the rest of your system.
@ -93,7 +90,6 @@ for developing nautilus extensions.
%setup -q -n %{name}-%{version}
#%patch4 -p1 -b .selinux
%patch7 -p1 -b .rtl-fix
%build
CFLAGS="$RPM_OPT_FLAGS -g -DNAUTILUS_OMIT_SELF_CHECK" %configure --disable-more-warnings --disable-update-mimedb
@ -168,6 +164,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%doc %{_datadir}/gtk-doc/html/libnautilus-extension/*
%changelog
* Thu Jun 07 2012 Richard Hughes <hughsient@gmail.com> - 3.5.2-1
- Update to 3.5.2
* Sat May 05 2012 Kalev Lember <kalevlember@gmail.com> - 3.5.1-1
- Update to 3.5.1

84
rtl-fix.patch
View File

@ -1,84 +0,0 @@
diff -up nautilus-2.23.90/libnautilus-private/nautilus-icon-container.c.rtl-fix nautilus-2.23.90/libnautilus-private/nautilus-icon-container.c
--- nautilus-2.23.90/libnautilus-private/nautilus-icon-container.c.rtl-fix 2008-08-18 19:04:40.000000000 -0400
+++ nautilus-2.23.90/libnautilus-private/nautilus-icon-container.c 2008-08-23 10:33:53.000000000 -0400
@@ -8923,40 +8923,6 @@ nautilus_icon_container_accessible_get_t
return type;
}
-#if ! defined (NAUTILUS_OMIT_SELF_CHECK)
-
-static char *
-check_compute_stretch (int icon_x, int icon_y, int icon_size,
- int start_pointer_x, int start_pointer_y,
- int end_pointer_x, int end_pointer_y)
-{
- StretchState start, current;
-
- start.icon_x = icon_x;
- start.icon_y = icon_y;
- start.icon_size = icon_size;
- start.pointer_x = start_pointer_x;
- start.pointer_y = start_pointer_y;
- current.pointer_x = end_pointer_x;
- current.pointer_y = end_pointer_y;
-
- compute_stretch (&start, &current);
-
- return g_strdup_printf ("%d,%d:%d",
- current.icon_x,
- current.icon_y,
- current.icon_size);
-}
-
-void
-nautilus_self_check_icon_container (void)
-{
- EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 0, 0, 0, 0), "0,0:16");
- EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 17), "0,0:17");
- EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 16), "0,0:16");
- EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129");
-}
-
gboolean
nautilus_icon_container_is_layout_rtl (NautilusIconContainer *container)
{
@@ -8994,4 +8960,39 @@ nautilus_icon_container_get_layout_heigh
}
+#if ! defined (NAUTILUS_OMIT_SELF_CHECK)
+
+static char *
+check_compute_stretch (int icon_x, int icon_y, int icon_size,
+ int start_pointer_x, int start_pointer_y,
+ int end_pointer_x, int end_pointer_y)
+{
+ StretchState start, current;
+
+ start.icon_x = icon_x;
+ start.icon_y = icon_y;
+ start.icon_size = icon_size;
+ start.pointer_x = start_pointer_x;
+ start.pointer_y = start_pointer_y;
+ current.pointer_x = end_pointer_x;
+ current.pointer_y = end_pointer_y;
+
+ compute_stretch (&start, &current);
+
+ return g_strdup_printf ("%d,%d:%d",
+ current.icon_x,
+ current.icon_y,
+ current.icon_size);
+}
+
+void
+nautilus_self_check_icon_container (void)
+{
+ EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 0, 0, 0, 0), "0,0:16");
+ EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 17), "0,0:17");
+ EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 16), "0,0:16");
+ EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129");
+}
+
+
#endif /* ! NAUTILUS_OMIT_SELF_CHECK */

2
sources
View File

@ -1 +1 @@
c37cd5613a03f107826d3d81a93d7528 nautilus-3.5.1.tar.xz
3da53f3d4facb0c4df98553ec65855b0 nautilus-3.5.2.tar.xz