From d22f6421555ac0baad42a5f6dceee3a6954bb929 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 23 Aug 2008 05:41:04 +0000 Subject: [PATCH] 2.23.90 --- .cvsignore | 2 +- nautilus.spec | 5 ++--- rtl-fix.patch | 15 ++++++++------- sources | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index 526a01a..e14d742 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -nautilus-2.23.6.1.tar.bz2 +nautilus-2.23.90.tar.bz2 diff --git a/nautilus.spec b/nautilus.spec index 1ffab30..945047c 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -84,8 +84,7 @@ Patch5: nautilus-2.23.5-selinux.patch # Why is this not upstream ? Patch6: nautilus-2.23.5-dynamic-search.patch -# doesn't apply anymore - was this upstreamed ? -#Patch7: rtl-fix.patch +Patch7: rtl-fix.patch #Patch8: nautilus-2.22.1-hide-white-screen.patch Patch10: nautilus-gvfs-desktop-key.patch @@ -129,7 +128,7 @@ for writing nautilus extensions. %patch3 -p1 -b .no-delay %patch5 -p1 -b .selinux %patch6 -p1 -b .dynamic-search -# %patch7 -p1 -b .rtl-fix +%patch7 -p1 -b .rtl-fix # %patch8 -p1 -b .hide-white-screen %patch10 -p0 -b .gvfs-desktop-key %patch15 -p1 -b .xds diff --git a/rtl-fix.patch b/rtl-fix.patch index 5c011b3..671c7e5 100644 --- a/rtl-fix.patch +++ b/rtl-fix.patch @@ -1,7 +1,7 @@ -diff -up nautilus-2.23.1/libnautilus-private/nautilus-icon-container.c.rtl-fix nautilus-2.23.1/libnautilus-private/nautilus-icon-container.c ---- nautilus-2.23.1/libnautilus-private/nautilus-icon-container.c.rtl-fix 2008-04-21 22:54:48.000000000 +0200 -+++ nautilus-2.23.1/libnautilus-private/nautilus-icon-container.c 2008-04-23 17:17:37.356353323 +0200 -@@ -8445,6 +8445,25 @@ nautilus_icon_container_accessible_get_t +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 01:38:37.000000000 -0400 +@@ -8923,6 +8923,25 @@ nautilus_icon_container_accessible_get_t return type; } @@ -27,7 +27,7 @@ diff -up nautilus-2.23.1/libnautilus-private/nautilus-icon-container.c.rtl-fix n #if ! defined (NAUTILUS_OMIT_SELF_CHECK) static char * -@@ -8479,23 +8498,4 @@ nautilus_self_check_icon_container (void +@@ -8957,24 +8976,6 @@ nautilus_self_check_icon_container (void EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129"); } @@ -49,5 +49,6 @@ diff -up nautilus-2.23.1/libnautilus-private/nautilus-icon-container.c.rtl-fix n - container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_R_L); -} - -- - #endif /* ! NAUTILUS_OMIT_SELF_CHECK */ + int + nautilus_icon_container_get_layout_height (NautilusIconContainer *container) + { diff --git a/sources b/sources index ac17669..6183b3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83a6ee496f994ee33272b86b3fdc81f9 nautilus-2.23.6.1.tar.bz2 +b0e419946b9adc32e3deb7157096971c nautilus-2.23.90.tar.bz2