[gentoo-commits] proj/kde:master commit in: kde-base/nsplugins/files/, kde-base/nsplugins/

[gentoo-commits] proj/kde:master commit in: kde-base/nsplugins/files/, kde-base/nsplugins/

[Andreas K. Huettel]

commit:     421ffcea249166d0afd17a387c6403827d10e9df
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Mar  5 10:55:21 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar  5 10:55:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=421ffcea

[kde-base/nsplugins] Fixed kdeenablefinal build, bug 349820

(Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 .../files/nsplugins-4.6.1-enablefinal.patch        |   20 ++++++++++++++++++++
 kde-base/nsplugins/nsplugins-4.6.9999.ebuild       |    2 ++
 kde-base/nsplugins/nsplugins-9999.ebuild           |    2 ++
 3 files changed, 24 insertions(+), 0 deletions(-)

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 0000000..e955cc0
--- /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 9ea3d27..91f076d 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 9ea3d27..91f076d 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 )

[gentoo-commits] proj/kde:master commit in: kde-base/nsplugins/files/, kde-base/nsplugins/

[Johannes Huber]

commit:     d20312aede98247c4472ce128e20e6c2c422c348
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 10:02:57 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 10:10:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d20312ae

[kde-base/nsplugins] Remove kdeenablefinal patch.

(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)

---
 .../files/nsplugins-4.6.1-enablefinal.patch        |   20 --------------------
 kde-base/nsplugins/nsplugins-4.7.97.ebuild         |    2 --
 kde-base/nsplugins/nsplugins-4.8.49.9999.ebuild    |    2 --
 kde-base/nsplugins/nsplugins-9999.ebuild           |    2 --
 4 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/kde-base/nsplugins/files/nsplugins-4.6.1-enablefinal.patch b/kde-base/nsplugins/files/nsplugins-4.6.1-enablefinal.patch
deleted file mode 100644
index e955cc0..0000000
--- a/kde-base/nsplugins/files/nsplugins-4.6.1-enablefinal.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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.7.97.ebuild b/kde-base/nsplugins/nsplugins-4.7.97.ebuild
index 6b24d1b..3295343 100644
--- a/kde-base/nsplugins/nsplugins-4.7.97.ebuild
+++ b/kde-base/nsplugins/nsplugins-4.7.97.ebuild
@@ -21,5 +21,3 @@ RDEPEND="${DEPEND}
 KMEXTRACTONLY="
 	konqueror/settings/
 "
-
-PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )

diff --git a/kde-base/nsplugins/nsplugins-4.8.49.9999.ebuild b/kde-base/nsplugins/nsplugins-4.8.49.9999.ebuild
index 7e74693..5afb401 100644
--- a/kde-base/nsplugins/nsplugins-4.8.49.9999.ebuild
+++ b/kde-base/nsplugins/nsplugins-4.8.49.9999.ebuild
@@ -21,5 +21,3 @@ 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 7e74693..5afb401 100644
--- a/kde-base/nsplugins/nsplugins-9999.ebuild
+++ b/kde-base/nsplugins/nsplugins-9999.ebuild
@@ -21,5 +21,3 @@ RDEPEND="${DEPEND}
 KMEXTRACTONLY="
 	konqueror/settings/
 "
-
-PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )