diff options
| author | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2011-03-05 11:55:21 +0100 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2011-03-05 11:55:21 +0100 |
| commit | 421ffcea249166d0afd17a387c6403827d10e9df (patch) | |
| tree | 35629fda1abb69dd454d91066dd13b490384c28e | |
| parent | 4e1594820098da0928e9740ca2d5174f97b9673b (diff) | |
| download | kde-421ffcea249166d0afd17a387c6403827d10e9df.tar.gz kde-421ffcea249166d0afd17a387c6403827d10e9df.tar.bz2 kde-421ffcea249166d0afd17a387c6403827d10e9df.zip | |
[kde-base/nsplugins] Fixed kdeenablefinal build, bug 349820
(Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
| -rw-r--r-- | kde-base/nsplugins/Manifest | 25 | ||||
| -rw-r--r-- | kde-base/nsplugins/files/nsplugins-4.6.1-enablefinal.patch | 20 | ||||
| -rw-r--r-- | kde-base/nsplugins/nsplugins-4.6.9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-base/nsplugins/nsplugins-9999.ebuild | 2 |
4 files changed, 47 insertions, 2 deletions
diff --git a/kde-base/nsplugins/Manifest b/kde-base/nsplugins/Manifest index c2c7a933934..4dd8e010e1f 100644 --- a/kde-base/nsplugins/Manifest +++ b/kde-base/nsplugins/Manifest @@ -1,3 +1,24 @@ -EBUILD nsplugins-4.6.9999.ebuild 368 RMD160 7bccf9a6b004d8c2f752c03fefc6d55f09f697a2 SHA1 fed4a4d8cd6d81d40b74df02b613d23ce2b7c68b SHA256 af4a0b99c8183aee2489508514d6bc56228f8af4ca22d48a514ef5f718fdbdc4 -EBUILD nsplugins-9999.ebuild 368 RMD160 7bccf9a6b004d8c2f752c03fefc6d55f09f697a2 SHA1 fed4a4d8cd6d81d40b74df02b613d23ce2b7c68b SHA256 af4a0b99c8183aee2489508514d6bc56228f8af4ca22d48a514ef5f718fdbdc4 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX nsplugins-4.6.1-enablefinal.patch 528 RMD160 223d6ca8f49de028b9af423ef31fc5edc05609da SHA1 15dc565027b7e99a45dc61c46576ab6ffb837cf4 SHA256 f81d76fbaf3d121f5005feb38e3377d63b7d057095a021cf3895323de15248bf +EBUILD nsplugins-4.6.9999.ebuild 425 RMD160 abdeb21190dfe510e9b741858b5f3f465853c2e1 SHA1 0a92d5ea8452c437ec26708259cfb90f5610965e SHA256 be2be855dcbe2a586714c4ea1c9460b512e6c020e2ca20a40af4096e03606f5e +EBUILD nsplugins-9999.ebuild 425 RMD160 abdeb21190dfe510e9b741858b5f3f465853c2e1 SHA1 0a92d5ea8452c437ec26708259cfb90f5610965e SHA256 be2be855dcbe2a586714c4ea1c9460b512e6c020e2ca20a40af4096e03606f5e MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQIcBAEBAgAGBQJNchaZAAoJENwGBM22xffeyYcP/0E4sG0sL3MsrSJRRQ+4Iknl +CtskZCQCyUiainAL+gDf8KXk18ithyvdo7XxsxbYerPLaB3nkChs65ZEHhg/ELBu +pzJuZnoI9dGjLzH/LC6y/Z9mRlOjYqGQ1rydN5Iqk2f6SFKGjfu29Q0IETCa5Fas +P2TABFSbeDvXXWBitmcsNgfIaIeSQB1glDErdcVYjKeY7Oe7weRVWloilU91d9iM +2q5lKSSSLRlLd4CKSUxB1zZ7cqO4JwHDJGcv9J03eyAzjXMJ+0JM+KDZcmmVGKOY +l25rFjGYtlHCUwKUF/4VXXQ0LHSeWcf0uW0/jLkO4YXps/S/u0obMiy4YlDTQtS7 +vnpUCtHiefVzRWSTPll9l4ppufFVd7Cj8A63w164NZpnNCyogC/WQ14rbhT54BtS +/g/xPu44hvhEBdAJM+bHMZk/aBJ/thYl/G69Gv4Ma970jwX6tBNPZfMmpFzHV4pN +q5Yi8hiEEcn47iiAEy4BB28AjF3ubwa+itmxWX50zb+JgGAmD5W0cbsur56m7Gpy +0YJRQW/o/LCzaZVpsWWKW3VF92zoAlKS6ywW6WQtM/TZLfgpAsFnso7dc8objIM+ +Z0Hj4PQ7qfmeyKhRbFiBRmsVHK3jgNmVrewC+SYriNLgeMqWhNazNto9YptMI1qF +XEFFg1f5Vw+f6lE9WqM/ +=J3KU +-----END PGP SIGNATURE----- diff --git a/kde-base/nsplugins/files/nsplugins-4.6.1-enablefinal.patch b/kde-base/nsplugins/files/nsplugins-4.6.1-enablefinal.patch new file mode 100644 index 00000000000..e955cc0af14 --- /dev/null +++ b/kde-base/nsplugins/files/nsplugins-4.6.1-enablefinal.patch @@ -0,0 +1,20 @@ +--- nsplugins/viewer/scripting.h.orig 2010-12-26 01:50:16.704000278 +0100 ++++ nsplugins/viewer/scripting.h 2010-12-26 01:57:20.581000171 +0100 +@@ -20,6 +20,9 @@ + + */ + ++#ifndef VIEWER_SCRIPTING_H ++#define VIEWER_SCRIPTING_H ++ + #include "nsplugin.h" + #include "sdk/npruntime.h" + #include <kparts/browserextension.h> +@@ -93,5 +96,6 @@ + + } // namespace kdeNsPluginViewer + +-// kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on; ++#endif + ++// kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on; diff --git a/kde-base/nsplugins/nsplugins-4.6.9999.ebuild b/kde-base/nsplugins/nsplugins-4.6.9999.ebuild index 9ea3d27db16..91f076d8a44 100644 --- a/kde-base/nsplugins/nsplugins-4.6.9999.ebuild +++ b/kde-base/nsplugins/nsplugins-4.6.9999.ebuild @@ -21,3 +21,5 @@ RDEPEND="${DEPEND} KMEXTRACTONLY=" konqueror/settings/ " + +PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch ) diff --git a/kde-base/nsplugins/nsplugins-9999.ebuild b/kde-base/nsplugins/nsplugins-9999.ebuild index 9ea3d27db16..91f076d8a44 100644 --- a/kde-base/nsplugins/nsplugins-9999.ebuild +++ b/kde-base/nsplugins/nsplugins-9999.ebuild @@ -21,3 +21,5 @@ RDEPEND="${DEPEND} KMEXTRACTONLY=" konqueror/settings/ " + +PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch ) |