diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2018-01-18 09:06:56 +0100 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2018-01-18 09:06:56 +0100 |
| commit | bf0a364d27930c066ebb0bfc9ca7fe785d31c82b (patch) | |
| tree | 20cc2eea8df6e043b29fa81a98b2201d900324a8 /gnome-base | |
| parent | dev-ruby/bson: add 4.3.0 (diff) | |
| download | gentoo-bf0a364d27930c066ebb0bfc9ca7fe785d31c82b.tar.gz gentoo-bf0a364d27930c066ebb0bfc9ca7fe785d31c82b.tar.bz2 gentoo-bf0a364d27930c066ebb0bfc9ca7fe785d31c82b.zip | |
gnome-base/libgnome: remove utf-8 character from header
Closes: https://bugs.gentoo.org/639336
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/libgnome/files/libgnome-2.32.1-utf8-header.patch | 26 | ||||
| -rw-r--r-- | gnome-base/libgnome/libgnome-2.32.1-r1.ebuild | 6 |
2 files changed, 31 insertions, 1 deletions
diff --git a/gnome-base/libgnome/files/libgnome-2.32.1-utf8-header.patch b/gnome-base/libgnome/files/libgnome-2.32.1-utf8-header.patch new file mode 100644 index 000000000000..a70dccc97e75 --- /dev/null +++ b/gnome-base/libgnome/files/libgnome-2.32.1-utf8-header.patch @@ -0,0 +1,26 @@ +From 33313713c4f5c1de500859ff128d6fd7e3af5722 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@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) \ +-- +cgit v0.12 + diff --git a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild index d26add359071..7134bf05adb7 100644 --- a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild +++ b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -40,6 +40,10 @@ src_prepare() { # Make sure menus have icons. People don't like change epatch "${FILESDIR}/${PN}-2.28.0-menus-have-icons.patch" + # Remove UTF-8 character from headers + # https://bugs.gentoo.org/639336 + epatch "${FILESDIR}"/${PN}-2.32.1-utf8-header.patch + use branding && epatch "${FILESDIR}"/${PN}-2.26.0-branding.patch # Default to Adwaita theme over Clearlooks to proper gtk3 support |