diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-19 20:11:46 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-19 20:11:46 +0000 |
| commit | 5b5df25227111ef465caf5c52bcfb66dac3219cd (patch) | |
| tree | 31b713cac6188358125cbb66b8804030328740f0 /gnome-base/libgnome | |
| parent | 02e2208f46f4e2c00fb9743cbc47350bdd233bfa (diff) | |
gentoo resync : 19.01.2018
Diffstat (limited to 'gnome-base/libgnome')
| -rw-r--r-- | gnome-base/libgnome/Manifest | 3 | ||||
| -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 |
3 files changed, 33 insertions, 2 deletions
diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest index e766b0a2217e..090a708e04bc 100644 --- a/gnome-base/libgnome/Manifest +++ b/gnome-base/libgnome/Manifest @@ -1,6 +1,7 @@ AUX libgnome-2.26.0-branding.patch 839 BLAKE2B b7f994739db6c2119bca6abfcc8c53221979a148f972470b0c9c2d2d126baee145e32de074a63c2aac5fda1a35dd9201904e13150876994bca42a9f60a7a9714 SHA512 de12f680f875ade002c752ea6595969b2948196299d3807592bb014ade59c51093e1d19f56d2f69fe381fece037a48c7dcb44c632ddc19128959db1dec54f473 AUX libgnome-2.28.0-menus-have-icons.patch 538 BLAKE2B e4bca7e5ae5c7fe38d88e13347896a2d636db82584d0cbda015d617b14bc0ecbb434bc0f9ebc946765a3ec2c8e6f55ab1c7d2f780d955dedcaa0d007399544df SHA512 4897bd5497fd9cfbf778ab7c815028e5b819d1c1f69d2ad9bedb0f5895e8c7b7b40a918436026e494c83238c694145670046a0d0beeda31c5820bed5867eb1d2 +AUX libgnome-2.32.1-utf8-header.patch 930 BLAKE2B 32065fbe8e6d931f6c79209eb8acf11a4eda339832172822c6997a2ed03146d81d38d3ebb8b8238f3da9d62c0d8ad2c0937bb6e787f4889d68145adfbbcee290 SHA512 b72f124358ad66d00d00435cb5087163077361d33082e2b1dd9c06b9dd97203d515943d21214e834d2d0fbeedde7a85414b1a9ce39e734d6e1bf1bdab1664ad3 DIST gentoo-gdm-theme-r3.tar.bz2 411703 BLAKE2B a4373d291f6813d2d07b78b23f5b5d1e288cb4a979a7b5cbe1351e6432cae2b24c07fa467b08c590a100e22807b3aa77ff085e0b8a9268e5542e81495013928a SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a DIST libgnome-2.32.1.tar.bz2 1776006 BLAKE2B 3e9fa78bf1b9a550588374809c90f7cabd7fc3fe17f18d6e1ce0ea463bfb6999279d1e0cfb4d8df1c64571e6d8c6a9c90bbe558ba7cd8c99f2a100bf9fbf83d9 SHA512 f94e603255a93e73249e0fd9ed5604d732b44ad46f3cc3065afb46fc6162f6cf29304f49440b5c06303b8e68608b6fd16236076813febb5f1cbdcde4bfc3b3e3 -EBUILD libgnome-2.32.1-r1.ebuild 1662 BLAKE2B 06e15f6af889cd045284e0c803f494aed3aa8e337fd2179657296903bc243733362ec192eb0408edc6b2d59b441dcdacb60a3d5f35aa8f3d2bf7163593878a43 SHA512 eb5f695ad155c6c94b90969ac4fd07e9b9ce36bdba8d0feabdebb3f80289ffa39372999427fde31ca0bb40242aa97b8c73b87fe07806d5bde62b7a6928e294e7 +EBUILD libgnome-2.32.1-r1.ebuild 1789 BLAKE2B e1ec0ef50077a5056443c41787b6ffd9c94d2e2c6af9f2023b1ab8a127e9b48793474483ee9f6e91401449718b5e1478f36af01154703485c223f6ba865bd228 SHA512 561557e7b6f602141d78b812f233712a3dc8593c3d64702c0ef632eee3e7036defbba95995df05c26526ca0b72582ead89ba07d6170dadd797f6d64f2aa11939 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 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 |