[mate-file-manager] add patch to call gdk_pixbuf_loader_close() earlier (#558267)
leigh123linux
leigh123linux at fedoraproject.org
Sun Nov 11 06:44:52 UTC 2012
commit 5124510bcf7067ab547072be9cc1d69ea9ece128
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Sun Nov 11 06:44:40 2012 +0000
add patch to call gdk_pixbuf_loader_close() earlier (#558267)
close_earlier.patch | 29 +++++++++++++++++++++++++++++
mate-file-manager.spec | 15 ++++++++++++---
2 files changed, 41 insertions(+), 3 deletions(-)
---
diff --git a/close_earlier.patch b/close_earlier.patch
new file mode 100644
index 0000000..abf0d5e
--- /dev/null
+++ b/close_earlier.patch
@@ -0,0 +1,29 @@
+From d3ab8e137ae957e5afef54bf0ec1e275b96caab5 Mon Sep 17 00:00:00 2001
+From: Marcus Carlson <mdc at src.gnome.org>
+Date: Fri, 23 Jul 2010 20:40:54 +0000
+Subject: image-properties-page: call gdk_pixbuf_loader_close() earlier (#558267)
+
+This helps smaller images (>8192 bytes) to signal size_prepared before
+reading image geometry.
+---
+--- a/src/caja-image-properties-page.c
++++ b/src/caja-image-properties-page.c
+@@ -391,6 +391,10 @@ load_finished (CajaImagePropertiesPage *
+
+ gtk_widget_destroy (page->details->loading_label);
+
++ if (page->details->loader != NULL) {
++ gdk_pixbuf_loader_close (page->details->loader, NULL);
++ }
++
+ if (page->details->got_size)
+ {
+ #ifdef HAVE_EXIF
+@@ -437,7 +441,6 @@ load_finished (CajaImagePropertiesPage *
+
+ if (page->details->loader != NULL)
+ {
+- gdk_pixbuf_loader_close (page->details->loader, NULL);
+ g_object_unref (page->details->loader);
+ page->details->loader = NULL;
+ }
diff --git a/mate-file-manager.spec b/mate-file-manager.spec
index a9d964f..1490779 100644
--- a/mate-file-manager.spec
+++ b/mate-file-manager.spec
@@ -1,7 +1,7 @@
Name: mate-file-manager
Summary: File manager for MATE
Version: 1.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+ and LGPLv2+
Group: User Interface/Desktops
URL: http://mate-desktop.org
@@ -51,6 +51,10 @@ Patch6: signal_curtain.patch
# upstreamable, don't reference non-existent doc xml file
Patch7: mate-file-manager-1.4.0-docfix.patch
+# http://git.gnome.org/browse/nautilus/commit/?id=d3ab8e137ae957e5afef54bf0ec1e275b96caab5
+# https://github.com/mate-desktop/mate-file-manager/issues/29
+Patch8: close_earlier.patch
+
%description
Caja (mate-file-manager) is the file manager and graphical shell
@@ -89,6 +93,7 @@ sed -i -e 's,Categories=MATE,Categories=X-MATE,g' src/mate-network-scheme.deskto
#patch3 -p0 -b .symlink
#patch5 -p1 -b .no_session_delay
%patch7 -p1 -b .docfix
+%patch8 -p1 -b .close_earlier
NOCONFIGURE=1 ./autogen.sh
@@ -132,14 +137,14 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/mate-network-sche
%post
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-/bin/touch --no-create %{_datadir}/icons/mate >&/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
%preun
%postun
if [ $1 -eq 0 ]; then
- /bin/touch --no-create %{_datadir}/icons/mate >&/dev/null || :
+ /bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
fi
@@ -184,6 +189,10 @@ fi
%changelog
+* Sun Nov 11 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-3
+- add patch to call gdk_pixbuf_loader_close() earlier (#558267)
+- fix mistake in scriptlets
+
* Mon Oct 29 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-2
- add requires gsettings-desktop-schemas
- add build requires gsettings-desktop-schemas-devel
More information about the scm-commits
mailing list