r53428 - in /attic/libgnome/debian: changelog patches/05_fix_invalid_utf8.patch patches/series

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Mon Sep  4 00:37:11 2017
New Revision: 53428

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53428
Log:
Cherry-pick commit to fix build with latest glib2.0 (Closes: #870742)

Added:
    attic/libgnome/debian/patches/05_fix_invalid_utf8.patch
Modified:
    attic/libgnome/debian/changelog
    attic/libgnome/debian/patches/series

Modified: attic/libgnome/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnome/debian/changelog?rev=53428&op=diff
==============================================================================
--- attic/libgnome/debian/changelog	[utf-8] (original)
+++ attic/libgnome/debian/changelog	[utf-8] Mon Sep  4 00:37:11 2017
@@ -1,3 +1,10 @@
+libgnome (2.32.1-6) UNRELEASED; urgency=medium
+
+  * Cherry-pick 05_fix_invalid_utf8.patch to fix build with latest glib2.0
+    (Closes: #870742)
+
+ -- Jeremy Bicha <jbicha at debian.org>  Sun, 03 Sep 2017 20:34:42 -0400
+
 libgnome (2.32.1-5) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]

Added: attic/libgnome/debian/patches/05_fix_invalid_utf8.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnome/debian/patches/05_fix_invalid_utf8.patch?rev=53428&op=file
==============================================================================
--- attic/libgnome/debian/patches/05_fix_invalid_utf8.patch	(added)
+++ attic/libgnome/debian/patches/05_fix_invalid_utf8.patch	[utf-8] Mon Sep  4 00:37:11 2017
@@ -0,0 +1,23 @@
+From 33313713c4f5c1de500859ff128d6fd7e3af5722 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Mon, 7 Aug 2017 12:57:43 -0400
+Subject: gnome-config.h: Fix invalid UTF-8 in header
+
+This breaks the new Python `glib-mkenums`.
+---
+ libgnome/gnome-config.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgnome/gnome-config.h b/libgnome/gnome-config.h
+index 0c3dfe6..b9d659d 100644
+--- a/libgnome/gnome-config.h
++++ b/libgnome/gnome-config.h
+@@ -270,7 +270,7 @@ void gnome_config_clean_key_ (const char *path, gboolean priv);
+ #define gnome_config_private_clean_key(path) \
+ 	(gnome_config_clean_key_((path),TRUE))
+ 
+-/* returns the true filename of the config file�*/
++/* returns the true filename of the config file */
+ #define gnome_config_get_real_path(path) \
+ 	(g_build_filename (gnome_user_dir_get(),(path),NULL))
+ #define gnome_config_private_get_real_path(path) \

Modified: attic/libgnome/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnome/debian/patches/series?rev=53428&op=diff
==============================================================================
--- attic/libgnome/debian/patches/series	[utf-8] (original)
+++ attic/libgnome/debian/patches/series	[utf-8] Mon Sep  4 00:37:11 2017
@@ -1,3 +1,4 @@
 02_path_max.patch
 03_multiarch.patch
 04_disable_deprecated.patch
+05_fix_invalid_utf8.patch