[atril] add new patch series, fixes rhbz (#1082143)

[Wolfgang Ulbrich]

commit e6e1d10d1d8d04be2476d82d778733de874d26e7
Author: raveit65 <chat-to-me at raveit.de>
Date:   Mon Apr 21 11:44:23 2014 +0200

    add new patch series, fixes rhbz (#1082143)

 ...create_thumbnail_frame-should-return-NULL.patch |   25 +++++++++++++
 ...-sure-page-labels-are-valid-utf-8-strings.patch |   38 ++++++++++++++++++++
 2 files changed, 63 insertions(+), 0 deletions(-)
---
diff --git a/atril_create_thumbnail_frame-should-return-NULL.patch b/atril_create_thumbnail_frame-should-return-NULL.patch
new file mode 100644
index 0000000..883ec68
--- /dev/null
+++ b/atril_create_thumbnail_frame-should-return-NULL.patch
@@ -0,0 +1,25 @@
+From 3d8180a605e8c98172e9e0e739e22b7f50ed7bad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Aliste?= <jaliste at src.gnome.org>
+Date: Fri, 26 Nov 2010 11:56:45 -0300
+Subject: document: create_thumbnail_frame should return NULL when
+ source_pixbuf is NULL and width and height are not positive.
+
+Fixes bug #594408
+
+diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c
+index bfba1ec..e710edb 100644
+--- a/libdocument/ev-document-misc.c
++++ b/libdocument/ev-document-misc.c
+@@ -56,7 +56,7 @@ create_thumbnail_frame (int        width,
+ 	}
+ 
+ 	/* make sure no one is passing us garbage */
+-	g_assert (width_r >= 0 && height_r >= 0);
++	g_return_val_if_fail (width_r >= 0 && height_r >= 0, NULL);
+ 
+ 	retval = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+ 				 TRUE, 8,
+-- 
+cgit v0.10.1
+
+
diff --git a/atril_make-sure-page-labels-are-valid-utf-8-strings.patch b/atril_make-sure-page-labels-are-valid-utf-8-strings.patch
new file mode 100644
index 0000000..b1ede21
--- /dev/null
+++ b/atril_make-sure-page-labels-are-valid-utf-8-strings.patch
@@ -0,0 +1,38 @@
+From 150d0cfa2d8f64823f2782d207d717fa3ac340a0 Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <carlosgc at gnome.org>
+Date: Sun, 16 Oct 2011 11:23:30 +0200
+Subject: ps: Make sure page labels are valid utf-8 strings
+
+Fixes bug #654263.
+
+diff --git a/backend/ps/ev-spectre.c b/backend/ps/ev-spectre.c
+index 23957cd..e47e5fb 100644
+--- a/backend/ps/ev-spectre.c
++++ b/backend/ps/ev-spectre.c
+@@ -220,7 +220,21 @@ static char *
+ ps_document_get_page_label (EvDocument *document,
+ 			    EvPage     *page)
+ {
+-	return g_strdup (spectre_page_get_label ((SpectrePage *)page->backend_page));
++        const gchar *label = spectre_page_get_label ((SpectrePage *)page->backend_page);
++        gchar       *utf8;
++
++        if (!label)
++                return NULL;
++
++        if (g_utf8_validate (label, -1, NULL))
++                return g_strdup (label);
++
++        /* Try with latin1 and ASCII encondings */
++        utf8 = g_convert (label, -1, "utf-8", "latin1", NULL, NULL, NULL);
++        if (!utf8)
++                utf8 = g_convert (label, -1, "utf-8", "ASCII", NULL, NULL, NULL);
++
++        return utf8;
+ }
+ 
+ static EvDocumentInfo *
+-- 
+cgit v0.10.1
+
+