[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                              |    1 -
 patches/dev300/build-fix-xulrunner-npapi-inc.diff |   20 --------------------
 2 files changed, 21 deletions(-)

New commits:
commit ea90d650ca4af356a5cf093264c554d18e8216b7
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 28 18:13:48 2011 +0200

    pushed build-fix-xulrunner-npapi-inc.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9dae8fa..0889cfd 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1258,7 +1258,6 @@ mysqlcppconn-mysqlclient-SONAME.diff
 
 store-crash-fix.diff, thorsten
 sd-ppt-fix-document-summary-reading.diff, n#546758, rodo
-build-fix-xulrunner-npapi-inc.diff, janneke
 # FIXME ooo330-m2: does not apply: configure-fix-lpsolve-depends.diff, janneke
 
 [ DebianSidOnly ]
diff --git a/patches/dev300/build-fix-xulrunner-npapi-inc.diff b/patches/dev300/build-fix-xulrunner-npapi-inc.diff
deleted file mode 100644
index 14f93bb..0000000
--- a/patches/dev300/build-fix-xulrunner-npapi-inc.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- .../source/plugin/inc/plugin/unx/plugcon.hxx       |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git extensions/source/plugin/inc/plugin/unx/plugcon.hxx extensions/source/plugin/inc/plugin/unx/plugcon.hxx
-index c347fed..5fc40af 100644
---- extensions/source/plugin/inc/plugin/unx/plugcon.hxx
-+++ extensions/source/plugin/inc/plugin/unx/plugcon.hxx
-@@ -97,7 +97,7 @@ extern "C" {
- #  endif
- #endif
- 
--#ifndef _NPAPI_H_
-+#if ! defined ( _NPAPI_H_) && ! defined (npapi_h_)
- extern "C" {
- #include <npsdk/npupp.h>
- }
--- 
-1.7.0.1
-