summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-10-08 06:24:25 +0000
committerJeroen Roovers <jer@gentoo.org>2014-10-08 06:24:25 +0000
commit96a50b42a8b8054c60fef56c9391c50eae0c3cf5 (patch)
tree73a68388cd94dfed21358f264145ac36beaccc67 /x11-misc/xfe
parentVersion bump, bug#524740, cleanup (diff)
downloadhistorical-96a50b42a8b8054c60fef56c9391c50eae0c3cf5.tar.gz
historical-96a50b42a8b8054c60fef56c9391c50eae0c3cf5.tar.bz2
historical-96a50b42a8b8054c60fef56c9391c50eae0c3cf5.zip
Fix building against newer media-libs/freetype by Matthew Ogilvie (bug #514800).
Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'x11-misc/xfe')
-rw-r--r--x11-misc/xfe/ChangeLog6
-rw-r--r--x11-misc/xfe/Manifest12
-rw-r--r--x11-misc/xfe/xfe-1.37.ebuild8
3 files changed, 17 insertions, 9 deletions
diff --git a/x11-misc/xfe/ChangeLog b/x11-misc/xfe/ChangeLog
index 31be0e195887..5733834b987a 100644
--- a/x11-misc/xfe/ChangeLog
+++ b/x11-misc/xfe/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/xfe
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.96 2014/02/26 14:37:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.97 2014/10/08 06:24:24 jer Exp $
+
+ 08 Oct 2014; Jeroen Roovers <jer@gentoo.org> xfe-1.37.ebuild:
+ Fix building against newer media-libs/freetype by Matthew Ogilvie (bug
+ #514800).
*xfe-1.37 (26 Feb 2014)
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index 44e43bde4559..57f72cb360ea 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -5,13 +5,13 @@ AUX xfe-1.32.2-missing_Xlib_h.patch 605 SHA256 d622c9ea1abc0c0ced7294238051866ca
DIST xfe-1.34.tar.gz 2356801 SHA256 5e311b0609349ca5ad2c34d32ccb79863eb48f6b8a9fddcecf37f0dd368acf78 SHA512 7a5e4312a564137efd8f0a0940dd8e60c4ef6090171cc1c6fa3e09154089bc88ca2bb7b06ab01947043ddca30ae83c7a14c8649068daebe4745d1fd59dc1d3d4 WHIRLPOOL 9fd333d99473182450e00f5b9fbe5425659f93f2b393716f2bb4b36fec03d733e52b953420634efc3141911f38ced3d950c7907379a6b53e164868e9b49611e8
DIST xfe-1.37.tar.gz 2480940 SHA256 4dbb2e24b18a63d78afd0219232f05cd7401370750e2db5f8fa70a6fef022abd SHA512 32b4c7a4cba09504915735802a3adb1f4508920effb140e710911c5ae4663d1dcacfbedfc78f35473a2f40478c1a85f79865c1b6e3ede88ed193c1092d3e09e2 WHIRLPOOL 667347e8bb23f3fcdd4eef6221c1229f9586defeb3e70b1de962e189a234718e962726cb34751c434780ee89d1df584c2c98935afdd9fbd597246087bbf65ae7
EBUILD xfe-1.34.ebuild 1568 SHA256 e5e40c6b3c122ba7779694397723b014d008e6236786e86ac59fb4a805e60b05 SHA512 b1fbca38ecabb7b05587fa80bec0f0437a1b74688f8ab067f63d7ae416e4cb8b36493a00a70dfa6f1addad6af751ca7f8a5db018150b176afd25928badcabca4 WHIRLPOOL bbf4dd4bd822913d7975914a36a849dc28275ed3dd9f329408d0b3ee8b24433eca46c8fbd774935863cb9ef6e0ba5a84bc79bccc97b2c349b0ba3f473bb7ab15
-EBUILD xfe-1.37.ebuild 1650 SHA256 2dae53195312f2b53e03a11e90b2505317d47b6d3a23b6fca6fd6178b290a41c SHA512 b8344accc2e7b270bc420141f4963e90874d6cd0a81efb8ca181e53d8a68b57ec52d5540709d5c11a52c394b3ca68d4cfa2fa4ce2ea7f0f657ce17a8440bba46 WHIRLPOOL 443d1d421791aa5f194274a962d793819d45523aaddcd91205fb45a62b6188099de2c5a2342aec372333609e022d9683dc5476fb44aa2039f6892fc3b61d6083
-MISC ChangeLog 11860 SHA256 474fd49d097a85e25a2c8b3007f96e0ad557e49680cd305d70b7652e18283765 SHA512 17b5260c8418fd98a59c900a2708757dd797a8807f7f01864d97a4b751c65e44a95ef35c2750934bbc0054d885cd8206dbade6be3c0ae3cae824ca54c4f6f780 WHIRLPOOL 353907facdc1d7a2f1113e81eca9cd62ebcdf74816745fbf04176c0c8e685672ad152e0125a35859d9149575557232813af0eca3e00b0f327197bf0d2ace78fd
+EBUILD xfe-1.37.ebuild 1709 SHA256 e07217b533dec7397e62012525a1d9651cb2a6371c073f3f2a703bc204c10287 SHA512 f75242f38f81febf687e8a4397959e1c0fddc049e4cca5b3d4845c2f4056fd0b1f5bf658a16a8b6d49a703b7741cd4c6f3cb3091d5a014272cc35d9e82340edd WHIRLPOOL 1db2d01fcbc21c88d59234cc4b988597151c530d21fe714920c9b4b66c65b6fb8649f60437029fc2524738fe8d3060a6e837ac4303959fe37f0728b09a4ff410
+MISC ChangeLog 12010 SHA256 3a8e245e6364780a9ea3e92612cebdb9ab4f41dcaa97580090affae0b6fdcd8b SHA512 ce074cafa2bac88a230f5004efacb0084222069fd91a3fbd635b85acb9d2241bde7d6f131d71b9f7c765523e5b617a167f84133f6e2b4a8a900e6ef2285da8a2 WHIRLPOOL ee38c6e989fb7454e8eb3b4e16ce4da186c11d21dc0d6e0f946df9c22e139ea1f5f9a2bc985639afb79ca7cd5cf4b4c3879c253000d1c125a0afe13ede0e2c50
MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iEYEAREIAAYFAlMN/DUACgkQVWmRsqeSphMTSgCeK5jLi4nRC3ziPS1beD3Zuote
-myIAn0rrbxk4M35nK5An6eLH0JTR2PkJ
-=iIWn
+iEYEAREIAAYFAlQ02JkACgkQVWmRsqeSphOjXACeK2Uqk1+631wk8nWkM2hwMkhU
+G48AmgJEI4mte/UpspSNKcuJqVP4LMlT
+=acmu
-----END PGP SIGNATURE-----
diff --git a/x11-misc/xfe/xfe-1.37.ebuild b/x11-misc/xfe/xfe-1.37.ebuild
index 3a7482eb78d0..a3b00b0dd715 100644
--- a/x11-misc/xfe/xfe-1.37.ebuild
+++ b/x11-misc/xfe/xfe-1.37.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.37.ebuild,v 1.1 2014/02/26 14:37:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.37.ebuild,v 1.2 2014/10/08 06:24:24 jer Exp $
EAPI=5
@@ -62,7 +62,11 @@ src_prepare() {
rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;}
l10n_for_each_disabled_locale_do rm_locale
- sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
+ sed -i \
+ -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+ -e 's|freetype/config/ftheader.h|ft2build.h|' \
+ configure.ac || die
+
eautoreconf
}