From e41735be42468ae4cc27e717d9f3be1c1fd24bce Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Sun, 25 Dec 2011 17:03:28 +0000 Subject: [PATCH] Fix kdeenablefinal build, bug 395993 Package-Manager: portage-2.1.10.41/cvs/Linux x86_64 RepoMan-Options: --force --- kde-base/liboxygenstyle/ChangeLog | 6 +++- kde-base/liboxygenstyle/Manifest | 31 ++++++++++--------- .../liboxygenstyle-4.7.4-enablefinal.patch | 9 ++++++ .../liboxygenstyle-4.7.4.ebuild | 4 ++- 4 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch diff --git a/kde-base/liboxygenstyle/ChangeLog b/kde-base/liboxygenstyle/ChangeLog index 23ad74d4e908..33e10ac430d9 100644 --- a/kde-base/liboxygenstyle/ChangeLog +++ b/kde-base/liboxygenstyle/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/liboxygenstyle # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/ChangeLog,v 1.36 2011/12/18 19:46:39 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/ChangeLog,v 1.37 2011/12/25 17:03:27 dilfridge Exp $ + + 25 Dec 2011; Andreas K. Huettel + liboxygenstyle-4.7.4.ebuild, +files/liboxygenstyle-4.7.4-enablefinal.patch: + Fix kdeenablefinal build, bug 395993 18 Dec 2011; Andreas K. Huettel -liboxygenstyle-4.6.5.ebuild: diff --git a/kde-base/liboxygenstyle/Manifest b/kde-base/liboxygenstyle/Manifest index 370882bb2b4e..2ada5b70a83a 100644 --- a/kde-base/liboxygenstyle/Manifest +++ b/kde-base/liboxygenstyle/Manifest @@ -1,28 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 +AUX liboxygenstyle-4.7.4-enablefinal.patch 397 RMD160 e33ee023c6f99371daf064aed4ac73c7a6a47eeb SHA1 b86c3dd0c8e60722701898fa50caa70dfdb45ca7 SHA256 61c45b730844e6fa277f8722e4fe0a61299c86cff85142b2ba9229f0d10dfef5 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d EBUILD liboxygenstyle-4.6.3.ebuild 442 RMD160 6cc2bc6363f6ae25a8f060bc94670daf7545ad70 SHA1 b3b27519fc0b3eb07e08ed8f635725c8ce795fb5 SHA256 f3822f00992c330ad8ac5df0a44cf70c22c37248dc09c9ec004cc587e0ffed91 EBUILD liboxygenstyle-4.7.3.ebuild 441 RMD160 7b01287515f3777234d901aafca2027b42e41f50 SHA1 0d5579dea7e397fac7dc8ef6952fd9aa92b06e3f SHA256 d73b188d665dc2c35d2057c34548c3bc4e656910bdb09e4865b712b07e909cca -EBUILD liboxygenstyle-4.7.4.ebuild 441 RMD160 965b9bf657e66021b933581376a4bfd84cb54b84 SHA1 fbc2ee25865e955768d656b0e2bfce6369ad8b7a SHA256 e2b50d613cbfdadc7096c2ffd13bd143983f26632acab4e3533b5f56c13b3a05 -MISC ChangeLog 4964 RMD160 94a495da1596199dbf5a7b98b5680f9d6818f13b SHA1 2af8128bd88fe9e6e80245400171229f2cc84e39 SHA256 a27de3b62e5e7c471b75756e7652be98b0242313093316b14e63b68b0f702361 +EBUILD liboxygenstyle-4.7.4.ebuild 501 RMD160 9d2dd134e6d58d2b6579bd6515f1c71e766d5ad7 SHA1 1ec8564163424b038bf425bf13cdd52896a79010 SHA256 0322c8bbc43fe2b527480e44165309efb40f2ece28cc27fcf33388eb7ba01b8c +MISC ChangeLog 5139 RMD160 64710bf48dd1e7b616e45b38c4ece21e4464b69c SHA1 00207e51c5783d3190bcad2981a8363649989af6 SHA256 aecb7a952ba7368f332c3613c41472e85dc833013034037e03e18f1db7da81ea MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJO7kOJAAoJENwGBM22xffexQcP/13jkkC4fKGkl6WUSlMcD6Vf -D05wLn+T3M/ls3dwDHmw2d0GtB7t5lQABysyHnCqXTIe9zV5GQM4DPmhWloj2YEo -09SJrO3rHRHnFaP0C8l9UNSTKOHWP6PoDkirMZGu1nOtmrWUboTuFXgC3PxHnSSE -FvIBxhpH/crVXkEapHEzlDC4O0s3HcZDKOKpznyTMDbFLk055jrpCXSQpRmZBScc -bbfqZzwR2duXigMHtxEUarLAy93GU1sCOaofh03OrWWLgke2Os9cGKXSrj0ZJnOP -CoD++s8XxonvHFVv5ZMliV2tWPm4Kj2rPec3ORwexXBXEamW9WAB0MrOSKvWZ5T7 -P0xD8/8AbFuoi/PHMbwTuyGCYl563trkuIWcJkykcgH1ss1hJBpZIXh1rPBslVzs -fRFt82pa8eC+VklBiWfKiUpSSd5u4oCY8KcJSi++oxQcKS3YeiOotcF9KxOJzAnv -d203jz0eg9Yp245ab5dbu97dudQeoZThobzqeKBWzVFGcMvXGYPRDJLqG1Lbyq9l -ZMM+C1cNmfLlmPTZYwGhQyXsn7zB4JFt4f1MyQjft1k0HUSx9yvMvqJat2mtqpR8 -bWj8M4l8gzcAVL3Oeu4bOdLqLuTOdAr+Li4EVA5XThep0CX3RhEMPN7FJxzpmjyq -q1zsRXUYbwYwpYR4UwY2 -=X6mf +iQIcBAEBCgAGBQJO91fcAAoJEEb+UGWnxTyH5gQP+wQ7XgZRO8tRoS2BuUL00uOF +2bAEsQU5pjmzZh3VOcLfEASooC9mMi5JzCi1yGLdVxAxD/TUMGnoKZ/gjR/NantC +wLSHvKMpbFfkDyDpkNH4/Ji3mLxHVW40ycoMpyH5j0LyKBsiqfTvrTs487EBWE9S +UFqNCvfLKCKJ0ArTuS+tvKZdl1mOeXmrYX8jH+iUkTQ4h2dCW0+VIP8k5vmGfjE9 +xc4TNmcY31y+71fp+Wyy3fJok7T3mf2GJ9l3FkM8KWXsDlYLye8t+9gBdOBD+YqC +KBvB62HKVvK23rvCrAnpNqwWT2yp4mNZffViyKYj2NfNqQQrH2mhiXNa5aYCnx9t +6FIU8R8Ijqkf1ds7dRA7Eaq/VmTMD0ieB702V5BWxgxYbRKAdOaFwj6UzHyTPf7D +yLJywsO4fAPMiEPPgkKYplxjn0cGFQC+jq18F59eOurhoU4BvldDxgpK9gFRoqO4 +t+aAX46lo+jCc1IFQ71FyxjWxJHCekJDgDPtKGjMMm59T5OYkgJ5xK/jOG10qf9b +I5zt9sm+YwsQiIlp0d4ZMO65YPpCKjhxzqEyxNlYwscQnidLpXOkquRUNzfjRapL +wzlNQ6W78vWv9fVA9J8h7i6Y6seCCRyClTA0hbzv9BVNdTV8u+/lQ9xqWDlkmkcG +r2pA0cL7ubzQ2QArazRb +=83Zg -----END PGP SIGNATURE----- diff --git a/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch b/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch new file mode 100644 index 000000000000..369924858e20 --- /dev/null +++ b/kde-base/liboxygenstyle/files/liboxygenstyle-4.7.4-enablefinal.patch @@ -0,0 +1,9 @@ +diff -U2 -rxi kde-workspace-4.7.3.orig/libs/oxygen/oxygenhelper.cpp kde-workspace-4.7.3/libs/oxygen/oxygenhelper.cpp +--- kde-workspace-4.7.3.orig/libs/oxygen/oxygenhelper.cpp 2011-10-28 09:42:34.000000000 +0200 ++++ kde-workspace-4.7.3/libs/oxygen/oxygenhelper.cpp 2011-12-25 13:39:03.487455177 +0100 +@@ -37,4 +37,5 @@ + #include + #include ++#include + #endif + diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild index 5125ef509999..777b98fb7fcf 100644 --- a/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild +++ b/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild,v 1.1 2011/12/11 18:52:24 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/liboxygenstyle/liboxygenstyle-4.7.4.ebuild,v 1.2 2011/12/25 17:03:27 dilfridge Exp $ EAPI=4 @@ -11,3 +11,5 @@ inherit kde4-meta DESCRIPTION="Library to support the Oxygen style in KDE" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug" + +PATCHES=( "${FILESDIR}/${PN}-4.7.4-enablefinal.patch" ) -- 2.26.2