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

[Petr Mladek]

 patches/dev300/apply                |   11 ++---------
 patches/dev300/xulrunner-1.9.1.diff |   22 ----------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

New commits:
commit 5e1caa24a4837e89bc92a5ea4a7c0aae5e153da7
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 27 19:52:37 2011 +0200

    pushed xulrunner-1.9.1.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index deef804..3094bf8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -45,8 +45,8 @@ Localize : LocalizeFixes
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, Split, CustomUserConfig, DisableGCJ, BerkeleyDB43
 SUSE-10.1 : NovellBase, Java14, BrokenSystemNSS, Cairo10, SUSE101
 SUSE-11.1 : NovellBase, ImpressFontSize, PostgreSQL
-SUSE-11.2 : NovellBase, ImpressFontSize, PostgreSQL, SUSE112
-SUSE      : NovellBase, ImpressFontSize, PostgreSQL, SUSE112
+SUSE-11.2 : NovellBase, ImpressFontSize, PostgreSQL
+SUSE      : NovellBase, ImpressFontSize, PostgreSQL
 # Slackware
 Slackware : LinuxCommon, Mono, msaccess
 # Debian
@@ -418,10 +418,6 @@ SectionOwner => rengelha
 disable-helpcontent2.diff
 disable-xmlsearch-and-xmlhelp-jar.diff
 
-[ DebianOnly ]
-# build against xulrunner 1.9.1+
-xulrunner-1.9.1.diff, ccheney
-
 [ Mono ]
 SectionOwner => rodo
 
@@ -1048,9 +1044,6 @@ soffice-opengl-and-locking-config.diff, mklose
 [ SUSE101 ]
 sled10-splash.diff, i#123456, pmladek
 
-[ SUSE112 ]
-xulrunner-1.9.1.diff, ccheney
-
 [ MacOSXOnly ]
 SectionOwner => thorsten
 sfx2-global-scope-fix.diff, thorsten
diff --git a/patches/dev300/xulrunner-1.9.1.diff b/patches/dev300/xulrunner-1.9.1.diff
deleted file mode 100644
index cfb060c..0000000
--- a/patches/dev300/xulrunner-1.9.1.diff
+++ /dev/null
@@ -1,22 +0,0 @@
----
- np_sdk/mozsrc/npapi.h |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git np_sdk/mozsrc/npapi.h np_sdk/mozsrc/npapi.h
-index af64042..4a14df5 100644
---- np_sdk/mozsrc/npapi.h
-+++ np_sdk/mozsrc/npapi.h
-@@ -42,8 +42,9 @@
-  *  Netscape client plug-in API spec
-  */
- 
--#ifndef _NPAPI_H_
-+#if !defined(_NPAPI_H_) && !defined(npapi_h_)
- #define _NPAPI_H_
-+#define npapi_h_
- 
- #ifdef __OS2__
- #pragma pack(1)
--- 
-1.7.0.1
-