diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-10-04 10:18:27 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-10-04 10:18:27 +0000 |
| commit | 0e02fbdd0c973e718878a4969581f813c05f4716 (patch) | |
| tree | e9cd8150e03e83e78102131d3e4a3f704be455e7 /dev-util | |
| parent | version bump by Soren Harward in bug #524224 (diff) | |
| download | historical-0e02fbdd0c973e718878a4969581f813c05f4716.tar.gz historical-0e02fbdd0c973e718878a4969581f813c05f4716.tar.bz2 historical-0e02fbdd0c973e718878a4969581f813c05f4716.zip | |
Add forgotten patch (thanks to Gilles for noticing)
Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/meld/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/meld/Manifest | 9 | ||||
| -rw-r--r-- | dev-util/meld/files/meld-3.12.0-c-locale.patch | 23 |
3 files changed, 32 insertions, 5 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index b00e649387e5..98947744604b 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/meld # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.185 2014/10/04 08:30:48 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.186 2014/10/04 10:18:26 pacho Exp $ + + 04 Oct 2014; Pacho Ramos <pacho@gentoo.org> +files/meld-3.12.0-c-locale.patch: + Add forgotten patch (thanks to Gilles for noticing) *meld-3.12.0 (04 Oct 2014) diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index 0b34785724fa..91f2c24ae9fb 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -1,18 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX meld-3.12.0-c-locale.patch 797 SHA256 baf86737655bbc162d254595356ad21687bea8bd04cb028466784b8249e39883 SHA512 3cb5a463c43b47ec51908c543ee786c28a7e27b0a9c4436943e11e78ea716a19b4e77aa67f8a681a077591ebc5e70458697e4835b47769d294a0b41a4335778b WHIRLPOOL 830eb1e17ae79faa05b7b8dfb16bd72ab9330c5779d4ca16e3d78db345334f4a2bd43f1db8df8f1216520758f0fbdbb7092ebd1ccf97a8b5cac4a1395c912d0b DIST meld-1.8.5.tar.xz 444872 SHA256 e0f1d6007117a4be95d7c399359cb2ebfa80f2b9158222d727e9a35ae4d5d44d SHA512 09b36923fedfb8f67dd120a71a1fb591efd812b8e1e451281ffee639ce02a7c8fd0d280254c5270ec547df38a30c53a309a7749fa2a63093bd3cf8f46195332b WHIRLPOOL 3ae3bafcc99a57e794d7b3d4e794d31b70257cc20800093932d8f5e9ceca3aee9bbe49a80382ef6b206bac23f20e153904c2a074a66fc69fc803354f44bdc858 DIST meld-1.8.6.tar.xz 447196 SHA256 af96682b8f4bf3ad4221c853b1516218d62a17ff43c38f4a83e7e8ac6736e8a5 SHA512 7a1c52c6686efab1e233f1f1506b9f0a8d4c040150fefc63d09510156a17819c375c9d10090c97e4a913ce3887d118ee09e75af7de4def24dfc5a75d5ad71511 WHIRLPOOL 83cff8350ecbe518b5f4508cb8d92d6569204062be05583e2dbca342a52ad2e9c0da15dbc03cf172e93e5b892e53d58a4d2ff6db5049bd20057b19a24e87efd7 DIST meld-3.12.0.tar.xz 460596 SHA256 6d902884e8c4ca29d16b4852d7287345bfe293367959dac342fdc117a511c53f SHA512 0000fe41fee8d0215aac4aa87c6adb2533656b05f2d5a0097536a1a76920595fc6fa48bd29fa35557b40f44410304ecf8e5c208d10eadb578455a48758d5602f WHIRLPOOL 0371ff5bf876be3a2dd3391201d8ddbe5215a67702ae7bd9dc814cb6d67ee7258f26ad68733f67d102e4a9b381a3266b0e5f7cad79be5f64d86b3624b2c15b66 EBUILD meld-1.8.5.ebuild 1839 SHA256 0d32d790f5b87cea4409b262339441c443afeb9a79eaa9040b359862cf77aeb9 SHA512 85d6fb5266174888b8dbcf4f8e17678bcd4bfeb65410538577ce9a3b7a526c55efad5227da4b9e232a28c52f7487c94ff8867e9ae6c4e0717bc45689a9fb4ba6 WHIRLPOOL d8b283ad0d2d3d54d96c6503ba1dc8ff0bd336ba974b1b849f463bacd08eef942628e83cb1044f3d6be5538278f2d76b4ed6cedba93aac563b2054af7c1e1fd2 EBUILD meld-1.8.6.ebuild 1843 SHA256 cd688e11039496274aded395035acea0cc283c4f4d1c508c3101f5e6cc69cdcd SHA512 2a06ba1feb9fcf571d554310c1c6e18467a8f05203f1837684437234e8419dff54dca914986a0ebffb7aa373ed231543899383720a38e5e7dd34aebeabfd6de7 WHIRLPOOL 13e13361620548bc5f019bfa357bdcefdf252f25c61cb11551c8d31360a48f880c1a3d9740ff68fb3ae9ee4c82a836ed0a022410fb13c095422c8a4bac656af6 EBUILD meld-3.12.0.ebuild 1059 SHA256 725ddfdab8d6e52ba31c136a56ac04181d49854493516403582244d5d58991da SHA512 c8e6b8390e53e04a2a0eab9d76f356d849ed13209cb5bb993ecd95dcc5a5eb0232b677d0f878e2c9f97071021690610dd21846015b6a5fa20ce5cb4a92580fc6 WHIRLPOOL b4704bfc1fe0276c4fedef754c079c4969421d6d4d4d44ed1bcfbd1beb2cc53b80d545a651d5ef99f2d6ef3efd78f81936167250113a3c348cae0522454a3c66 -MISC ChangeLog 23511 SHA256 8e7ccdb6771bacc994f3ef4bbe14d2e6faecb441dd5face7837f97f320d04c7f SHA512 0541d2423194710ff3d5773d2fb1b6591257faf7b8abbe2fe96ea8b2cbb20bf1a6b5adb5b7e3ebd30b91176c2c7c5a2c525a658caf7b375cf47deb51f768af0a WHIRLPOOL 6ac5a12774a91d8b0d5b432685d9f127918c7c4b8e2fdedad41d6a099a1982da0e048a1778ee907f690a7cc916436787c3c2d50b1e90a32a61eabe72422b126d +MISC ChangeLog 23647 SHA256 78a6e34ec50aa925a1e4e07425d39898b5187ac1ed4f8801c2b5a76e6b9f0773 SHA512 5e9db90b5f7d2a8c93f95d9fc5453c77eb9a4c013c8d8c3cbfa140fb220cec351e8a53601908a670572769819a15d693138e888831bf48a8f5e8c3f864421476 WHIRLPOOL 743ff0ddf6ea4ca7d07f02286571bf8b4f6e95bc993e1717f9db12f0dac3cc2fc38e62002bf2e1f66c7d215a6b5b087b3e240353d92f859cddc60db7313d2f2b MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQvsDkACgkQCaWpQKGI+9TVcQCfcxNXLKMlvTWEJsDmbxVYTJ2J -DuMAoIPzAoFJrh87lZiEX6Sb8Zbsuezm -=XdA+ +iEYEAREIAAYFAlQvyXMACgkQCaWpQKGI+9TgQACdFmhTZpwg8NTVbtCowvFlzJ/N +lYoAn16lDXXF+b42LD/osiL8b6ILmMDp +=8OTk -----END PGP SIGNATURE----- diff --git a/dev-util/meld/files/meld-3.12.0-c-locale.patch b/dev-util/meld/files/meld-3.12.0-c-locale.patch new file mode 100644 index 000000000000..eee7b9695649 --- /dev/null +++ b/dev-util/meld/files/meld-3.12.0-c-locale.patch @@ -0,0 +1,23 @@ +From c361e4eaccfaed4f5c5d64a206ea7941e3ef8a57 Mon Sep 17 00:00:00 2001 +From: Kai Willadsen <kai.willadsen@gmail.com> +Date: Sat, 4 Oct 2014 10:01:05 +1000 +Subject: build_helpers: Make sure that we build help for C locale (bgo#737833) + + +diff --git a/meld/build_helpers.py b/meld/build_helpers.py +index 385e3dc..69ad5bf 100644 +--- a/meld/build_helpers.py ++++ b/meld/build_helpers.py +@@ -117,6 +117,9 @@ class build_help(distutils.cmd.Command): + else: + self.selected_languages = os.listdir(self.help_dir) + ++ if 'C' not in self.selected_languages: ++ self.selected_languages.append('C') ++ + self.C_PAGES = glob.glob(os.path.join(self.help_dir, 'C', '*.page')) + self.C_EXTRA = glob.glob(os.path.join(self.help_dir, 'C', '*.xml')) + +-- +cgit v0.10.1 + |