From d9db90b32dba3de14956a3d2b6bc3a34dc27925a Mon Sep 17 00:00:00 2001 From: Ian Stakenvicius Date: Fri, 5 Dec 2014 21:01:40 +0000 Subject: [PATCH] fixed CMakeLists.txt to include all freetype headers, bug 517270 Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0x2B6559ED --- x11-misc/slim/ChangeLog | 6 +++++- x11-misc/slim/Manifest | 13 +++++++------ x11-misc/slim/files/slim-1.3.6-freetype.patch | 12 ++++++++++++ x11-misc/slim/slim-1.3.6-r3.ebuild | 3 ++- x11-misc/slim/slim-1.3.6-r4.ebuild | 3 ++- 5 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 x11-misc/slim/files/slim-1.3.6-freetype.patch diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog index ba952aafce91..8e1d3224b07d 100644 --- a/x11-misc/slim/ChangeLog +++ b/x11-misc/slim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/slim # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.138 2014/09/20 23:52:02 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.139 2014/12/05 21:01:34 axs Exp $ + + 05 Dec 2014; Ian Stakenvicius (_AxS_) + +files/slim-1.3.6-freetype.patch, slim-1.3.6-r3.ebuild, slim-1.3.6-r4.ebuild: + fixed CMakeLists.txt to include all freetype headers, bug 517270 20 Sep 2014; Jeroen Roovers slim-1.3.6-r3.ebuild, slim-1.3.6-r4.ebuild: diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest index cd5d75f52127..e76c1d7ac2fc 100644 --- a/x11-misc/slim/Manifest +++ b/x11-misc/slim/Manifest @@ -8,6 +8,7 @@ AUX slim-1.3.6-config.diff 2934 SHA256 5f7f1fcd6d0d28a4060b2360fdbd0489dd3884087 AUX slim-1.3.6-drop-zlib.patch 309 SHA256 d90ead30ef02aa4e0f6fcc9b23c248522409749338972c8d343880e66478ac8b SHA512 2aa62e5b7ad67df47009e4cff0b34b8ff6116e9d3d23194c8199ec06356fbf0660df6b807e530075d3dc5aa8e04dda29e7a6e1337212b58e3bae09e9543c0c22 WHIRLPOOL b16da43ede2991bc14af3063d187301e93c29deb96c336a7558caeabcc5ba92bf425512252e170ee45f48dcbb2837e0c46dd7c828ad1943e65b3100df3dd18b0 AUX slim-1.3.6-fix-slimlock-nopam-v2.patch 839 SHA256 7ee18c47e3159145be99b16bc2a8c56543043be17ff4527e581cf033a0b4d42e SHA512 2251cd96801e593b387037d79014ea86fdec223d8910628fbfd0e9c5eafbe79c27ffb7f08123c89b635d33dc2bf9cf76e2964f5293352784c1e08c7b1c7427c0 WHIRLPOOL ec303bf8a764e0445726df941d1e09b94d0aaae522f43146dc3a5fef4ad197f0bd654d081489f51a7ed0cbbf30fe8954abb1f5ff5066e4ca69bbb04e21373c54 AUX slim-1.3.6-fix-slimlock-nopam.patch 733 SHA256 052ca6357c180f19bc9a4b64fc04b652e0724faaf1e2af7280fb15ebaaf981c3 SHA512 ca0c9ae4ec1babb5572e05de084c92257cbbfaa9be78f5b537acfc180a05470667c00e95094756a3f4608b57c223c566040554367734fc6a5f8caa5f442eab7d WHIRLPOOL 51b87928a78a2d442f4d7f02cb71847f819b6433c67d8c7e47a9ba7b045f9e8a265828b2c2f9c813413bb1798febc1fe3c33c6277944e90e67003cf30b0c98d5 +AUX slim-1.3.6-freetype.patch 426 SHA256 8bf59d9d4ebbf629f524331fa0389937ccbe1074a5e7d8eb1cfed4264986669b SHA512 e7181993d305b5dd2d27c9c44ffa944c07a5fc9342c70a12f2f8283dff61db7ee3dc8aac50a566104dfb50ae06777b52835a4a2c3e19ad0e82b22a9487cd71aa WHIRLPOOL cd96fa2d38f55b470571d42e67d22f4a5660d5ff7b77e9e934c613a5141424305297a7dca5d03ea3a5cc4de60a339e7b9a63e3861e664642301e3e342ed46dc3 AUX slim-1.3.6-honour-cflags.patch 499 SHA256 7a19c872c2f3a290a74df246cdd3f08126f7ce46e63fb5074a326b81adb805bf SHA512 bbc99d396d30e034100e468d8d5a69cee3bc26eb6029793bdb95f29bd6364f680baec13e12e9ca7dcf01d84de3d8d45712462de36f6f729c7f8c232865a71a7a WHIRLPOOL 96941218006cd2d91efca231f9f2917431a1aa4e0afd31137809a90efb4e69122addf5257aff76b2b345606fa44b8593d9b3bb9d01125a83f751ea6f5945dc48 AUX slim-1.3.6-libslim-cmake-fixes.patch 852 SHA256 9565d206e0e34000975e59afbd2bc3de74fd3f590afdd9e34d0125cb3f12c75a SHA512 457e23e193c6b9ecb5335accad444470ffb2e0109550d041385bba2b6036fdfac8d48e031574e4229d8b8768a7a86f6d6c191b214540f1156a2a13e5a9f3451f WHIRLPOOL e712e7b829da0cc3113a7cc69364045467c89fa05a52b36ccc2393a708840f36108088088500485e251c9765eefd0485462876fb14ca15db09c49a7f63a81cad AUX slim-1.3.6-session-chooser.patch 3994 SHA256 3ee06061b10f42925cbd33ca25af1e870d4462be54c34e409fbe7b8f3bafa20e SHA512 7227fa0210d7870971870409da2d86d9f239ae285dde116e2b2d817318339fb51324bd11d04dc4c26a2ca3c1e5a0f0686987eab7042265389fb2f60cc7d37a45 WHIRLPOOL 594651c89d95210b28e8db7b7da547ab3009678be8312d8f94f79c71008aa7d4c3f2f02b71ce0624f400e84399a779b4544ac5523529255209c8e2f9a27b8f1c @@ -15,14 +16,14 @@ AUX slim-1.3.6-strip-systemd-unit-install.patch 474 SHA256 01e02399cad7f223233e7 AUX slim-1.3.6-systemd-session.patch 820 SHA256 1cb2b5f322ae975cd5a5a9ccca45854c642497638aa1707234d8595e58adee3e SHA512 df653a31bd2b0d3bb5b09d700d89d6b4c444b3ef49dc6d5a0646cab5480841a76ecb1c3bcd45b602eb0d2000971a5ef576eac63de67907769ea23b6925329635 WHIRLPOOL 7557d7afd65ad3dd232656f05f1da7735668c1bb55125b1c833c55f9e4ea1411dcbfd8a104cba0d4d0f94aecd29a9f36d56c06515464e78da772e2ee304019db AUX slim.logrotate 102 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2 WHIRLPOOL 9e940bd1d88613e46ac4a333afa0f02cd16c583a1b34f509c4409321f7d5c5e14ec86e38e9743a6176187a72e403683127fbaf293abbef678e23873c428613c1 DIST slim-1.3.6.tar.gz 232547 SHA256 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c WHIRLPOOL 473fa2f3752ec0c1bd2410ff3110649ce792c2e904928694b5fb8a43de619945276282e4a9de86198b9f38cdd74d1f9dc9cbcc754cc97989002b368ef26a8429 -EBUILD slim-1.3.6-r3.ebuild 3805 SHA256 14a5ce0e4aa7ecba3336f648782baa65e905d0be6f869e9f7d273a8b8e22f5a9 SHA512 a0b7fbae36973b8b1b50a44be16bf54841fe76f141954c4d0c387d873dab183c6811565e4fbaef8db1d139f8c55497af8bab7a9d7e1b7a15620838a390e36cf2 WHIRLPOOL f4c43b5e7de286d0e1cb83dd01f1fe0811921c742a27a38b35519c947422492d51d78cee6b25b29349ec3eadfae666df0e658e233b8e381300c8ffe2bc9038f9 -EBUILD slim-1.3.6-r4.ebuild 3813 SHA256 cbf4199ccc07cd36855abc2adf5eb683f5b13f07e87f989502454867e0e4e6a0 SHA512 42bd007014d0e87912f63f48a88395c2487862fa4b3ff21bcf53dca28f14c0d205d757d1be8ee5d1528c83a11a1416701c456fa1c6dd067c7455388bbdf934d4 WHIRLPOOL 03618f8663ce5bac40a9303960ff6c044171bde33391dfb722b2305f7844f8395508ec9745ec4cf9e4475bb37ba8763e31429462d418f68db1670e39e36b8796 -MISC ChangeLog 22534 SHA256 dc3470d2d632c28df0b878165290c76449337e59e3703dc9cec1cf6094d53ac8 SHA512 9f4583135edecfa807091ac786d3d69578894098b7050fc81a322fd57d6574ed3f1d279f7c83b389c52bea473f431437c86ec762e6c7593d21c8a79a5126b461 WHIRLPOOL c7d7de6adc5d216e807b10062449914167530ba981320c7740111d60ebf833361994db290d7e62e1aa71e1d9875013bfc6382cd1a40f4bf896f7d55fe7558dd5 +EBUILD slim-1.3.6-r3.ebuild 3847 SHA256 f7adf9228e6beef4a9adac6395993b50c63f4d6fd7228b56a01326a89bbe5308 SHA512 efccab834ccef27d7d1105ccb80b9d840591e974a864f7d7070135504439da6df727a51c693163690d86be0e23d106ef0068d5a9bca72fe7e17c9812a9f98683 WHIRLPOOL c047e756160d3e617d920bd654b7149c564253155c6f360116d00d38844ced2e72bbfea98f4701ee882efed64e53fbde5f7b73aa56e0de7834c80f9c8a56f532 +EBUILD slim-1.3.6-r4.ebuild 3855 SHA256 844d9b1dbb502c1d0303892a6570b5fb4f763102c86b77d709e7dd812b207a5c SHA512 8df29a5e09ca5e0341edfd1a0b6835d1881ebfeb0a68933a32f642ca4408a967b9cd39b0f91de9da76d6066b3a4cc17c161ba56b69aa74864d25a8aeb6cc8b81 WHIRLPOOL dd68fe1ef98fe0dbd3578c5333a4de5f73468c4f5131aaa8fa17f7ad09fea0de9357d75d7c8230eeadd1b46ecebf5f2bf27b787281864f66817e83565720ea97 +MISC ChangeLog 22739 SHA256 1e67ee4595a1e8158ecd11793aee571869c36ac957cbfcee33568fe3322567c2 SHA512 b4b057c02f75ce35393919f66b30bdab9e022ec3b4c84a3f2b1df8326cff73544242a7f8e89573158f4c3900de3445bca7cadc04e7711238ab5671d93ddbaf9b WHIRLPOOL f14e454abea01516a1fd930fa599077b09e0f53984fa377070e2ee706cc44392622793a7fb351d492cc7a6d89dec11b78293dbd0fba3f21e174aa55d43515097 MISC metadata.xml 317 SHA256 5b7154fd1fce1e40461b40b06533854dc7605d8b5eb19f68eeb9d84527c579c4 SHA512 6b5a9244c1b0fc0abec27900a10673fc431a0559d8cddd917d4117965e4ae569c153bc47ba3342ca4d8b114b949bcf10205a3d07645eb2a2834f300152028687 WHIRLPOOL 886788720a8dd6ca0fefa991e6e5f1640fa5913594be0acb6abcf92bb8e2d684a793721bdbb60a243f39cee097704b00620ae77c75a1f7d55672e875a34dedfc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQeEyQACgkQVWmRsqeSphNn6gCeO/APA4I3f/TKtslFBD4CK2R5 -co8AnR6HG+C4CVyJaY/to3pcB61tRH4M -=Cb8u +iF4EAREIAAYFAlSCHTMACgkQ2ugaI38ACPBrZQD8DsMYpir1EBwt479hJ+F4W4zF +QbMsBxVeBQeyaIZI+QoA/i5vFEAb71R6AIz8Z3afw75gob35Pl5XuOXOQm8XpB5y +=4JOV -----END PGP SIGNATURE----- diff --git a/x11-misc/slim/files/slim-1.3.6-freetype.patch b/x11-misc/slim/files/slim-1.3.6-freetype.patch new file mode 100644 index 000000000000..8cefc0bf0998 --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.6-freetype.patch @@ -0,0 +1,12 @@ +diff -up ./CMakeLists.txt.orig ./CMakeLists.txt +--- ./CMakeLists.txt.orig 2014-11-11 20:38:40.706121207 +0100 ++++ ./CMakeLists.txt 2014-11-11 20:39:34.206120264 +0100 +@@ -165,7 +165,7 @@ include_directories( + ${X11_Xft_INCLUDE_PATH} + ${X11_Xrender_INCLUDE_PATH} + ${X11_Xrandr_INCLUDE_PATH} +- ${FREETYPE_INCLUDE_DIR_freetype2} ++ ${FREETYPE_INCLUDE_DIRS} + ${X11_Xmu_INCLUDE_PATH} + ${ZLIB_INCLUDE_DIR} + ${JPEG_INCLUDE_DIR} diff --git a/x11-misc/slim/slim-1.3.6-r3.ebuild b/x11-misc/slim/slim-1.3.6-r3.ebuild index 027e2f8ecd57..b9bd76dc308a 100644 --- a/x11-misc/slim/slim-1.3.6-r3.ebuild +++ b/x11-misc/slim/slim-1.3.6-r3.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/slim/slim-1.3.6-r3.ebuild,v 1.10 2014/09/20 23:52:02 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.6-r3.ebuild,v 1.11 2014/12/05 21:01:34 axs Exp $ EAPI=5 @@ -46,6 +46,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-session-chooser.patch epatch "${FILESDIR}"/${P}-fix-slimlock-nopam.patch epatch "${FILESDIR}"/${P}-drop-zlib.patch + epatch "${FILESDIR}"/${P}-freetype.patch if use elibc_FreeBSD; then sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \ diff --git a/x11-misc/slim/slim-1.3.6-r4.ebuild b/x11-misc/slim/slim-1.3.6-r4.ebuild index 0a9cc91fdd7d..7cd291c3534e 100644 --- a/x11-misc/slim/slim-1.3.6-r4.ebuild +++ b/x11-misc/slim/slim-1.3.6-r4.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/slim/slim-1.3.6-r4.ebuild,v 1.3 2014/09/20 23:52:02 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.6-r4.ebuild,v 1.4 2014/12/05 21:01:34 axs Exp $ EAPI=5 @@ -46,6 +46,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-session-chooser.patch epatch "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch epatch "${FILESDIR}"/${P}-drop-zlib.patch + epatch "${FILESDIR}"/${P}-freetype.patch if use elibc_FreeBSD; then sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \ -- 2.26.2