[ooo-build-commit] .: 2 commits - patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Mon Apr 12 02:39:01 PDT 2010
patches/dev300/apply | 16 -
patches/dev300/no-mozilla-plug-in-option.diff | 338 +-------------------------
2 files changed, 24 insertions(+), 330 deletions(-)
New commits:
commit 0a1d2ef1b892778d94c90b9e44329fa0284a6bb4
Author: Rene Engelhard <rene at debian.org>
Date: Mon Apr 12 11:37:59 2010 +0200
move global nsplugin patches into own GlobalNSPluginSupport section
diff --git a/patches/dev300/apply b/patches/dev300/apply
index d5f9bb1..95e587f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -24,7 +24,8 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
msaccess, OpenGLTransitions, \
- Fpickers, Mono, AddressBooks, QuickStarter, KDE4, Netbook
+ Fpickers, Mono, AddressBooks, QuickStarter, KDE4, Netbook, \
+ GlobalNSPluginSupport
MacOSXCommon : Common, Defaults, TangoIcons, SystemBits
Win32Common : Common, Defaults, TangoIcons, \
Win32Only, NotDebian, BuildFixWin32
@@ -466,8 +467,6 @@ find-moved-help.diff, rene, i#107283
# printf arguments cleanup
buildfix-fmtargs.diff, cabral
-# more intelligent nsplugin seeking
-nsplugin-path.diff, i#49590, michael
# .. and fix 64bit archs
plugin.long.diff, i#110747, cmc
@@ -1123,14 +1122,18 @@ sc-default-delete-backspace-key.diff, i#17965, kohei
# migrate keyboard shortcuts & reset character set for CSV import dialog.
desktop-config-migration.diff n#367160, n#376473, n#421070, n#466064, kohei/jholesov
+[ GlobalNSPluginSupport ]
+# more intelligent nsplugin seeking
+nsplugin-path.diff, i#49590, michael
+# remove mozilla plug-in option completely since we enable it per default
+# and therefore this option is sense-/useless
+no-mozilla-plug-in-option.diff
+
[ DebianBaseOnly ]
SectionOwner => rengelha
default-cairo-disable.diff
gcj-32bit-runtime-path.diff, i#64888, mklose
-# remove mozilla plug-in option completely since we enable it per default
-# and therefore this option is sense-/useless
-no-mozilla-plug-in-option.diff
# read variables from /etc/openoffice/sofficerc, since /usr/lib/openoffice/sofficerc
# just refers to it
oosplash-etc-openoffice-sofficerc.diff
@@ -2577,7 +2580,6 @@ cws-kohei03-sc-macfix.diff, thorsten
[ PardusOnly ]
pardus-default-ExternalMailer.diff
pardus-clipart.diff
-no-mozilla-plug-in-option.diff
dont-check-fqdn.diff
[ UnUsedButNotYetRemovedFromGit ]
commit ccbe847895c86568ff22eec3bde5888b3c00b327
Author: Rene Engelhard <rene at debian.org>
Date: Mon Apr 12 11:33:32 2010 +0200
simplify no-mozilla-plug-in-option.diff
diff --git a/patches/dev300/no-mozilla-plug-in-option.diff b/patches/dev300/no-mozilla-plug-in-option.diff
index 7602172..6abfc31 100644
--- a/patches/dev300/no-mozilla-plug-in-option.diff
+++ b/patches/dev300/no-mozilla-plug-in-option.diff
@@ -1,325 +1,17 @@
-Index: svx/inc/svx/dialogs.hrc
-===================================================================
---- svx/inc/svx/dialogs.hrc 2008-12-31 18:07:00.000000000 +0100
-+++ svx/inc/svx/dialogs.hrc 2008-12-31 18:07:48.000000000 +0100
-@@ -258,11 +258,6 @@
- #define RID_SVXPAGE_INET_CACHE (RID_SVX_START + 158)
- #define RID_SVXPAGE_INET_TYPE (RID_SVX_START + 159)
- #define RID_SVXPAGE_INET_SEARCH (RID_SVX_START + 160)
--//added by jmeng begin
--#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161)
--#define GB_MOZPLUGIN 1
--#define CB_MOZPLUGIN_CODE 2
--//added by jmeng end
- #define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200)
-
- #define RID_SVXPAGE_BROWSER_OTHER (RID_SVX_START + 202)
-Index: svx/source/dialog/optinet2.cxx
-===================================================================
---- svx/source/cui/optinet2.cxx 2008-12-31 18:06:17.000000000 +0100
-+++ svx/source/cui/optinet2.cxx 2008-12-31 18:07:48.000000000 +0100
-@@ -1876,199 +1876,6 @@
- maProtectRecordsPB.SetText( sNewText );
- }
-
--//added by jmeng begin
--MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
-- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
-- aMSWordGB ( this, SVX_RES( GB_MOZPLUGIN ) ),
-- aWBasicCodeCB ( this, SVX_RES( CB_MOZPLUGIN_CODE ) )
--{
-- FreeResource();
--}
--
--MozPluginTabPage::~MozPluginTabPage()
--{
--}
--
--SfxTabPage* MozPluginTabPage::Create( Window* pParent,
-- const SfxItemSet& rAttrSet )
--{
-- return new MozPluginTabPage( pParent, rAttrSet );
--}
--BOOL MozPluginTabPage::FillItemSet( SfxItemSet& )
--{
-- BOOL hasInstall = isInstalled();
-- BOOL hasChecked = aWBasicCodeCB.IsChecked();
-- if(hasInstall && (!hasChecked)){
-- //try to uninstall
-- uninstallPlugin();
-- }
-- else if((!hasInstall) && hasChecked){
-- //try to install
-- installPlugin();
-- }
-- else{
-- // do nothing
-- }
-- return TRUE;
--}
--void MozPluginTabPage::Reset( const SfxItemSet& )
--{
-- aWBasicCodeCB.Check( isInstalled());
-- aWBasicCodeCB.SaveValue();
--}
--
--#ifdef WNT
--extern "C" {
-- int lc_isInstalled(const char* realFilePath);
-- int lc_installPlugin(const char* realFilePath);
-- int lc_uninstallPlugin(const char* realFilePath);
--}
--#endif
--
--#define NPP_PATH_MAX 2048
--inline bool getDllURL(rtl::OString * path)
--{
-- OSL_ASSERT(path != NULL);
-- ::rtl::OUString dirPath/*dllPath, */;
-- if (osl_getExecutableFile(&dirPath.pData) != osl_Process_E_None) {
-- return false;
-- }
-- dirPath = dirPath.copy(0, dirPath.lastIndexOf('/'));
--// osl::FileBase::getAbsoluteFileURL(dirPath, libPath, dllPath);
-- ::rtl::OUString sysDirPath;
-- osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath);
-- *path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US);
-- return true;
--}
--
--BOOL MozPluginTabPage::isInstalled()
--{
--#ifdef UNIX
-- // get the real file referred by .so lnk file
-- char lnkFilePath[NPP_PATH_MAX] = {0};
-- char lnkReferFilePath[NPP_PATH_MAX] = {0};
-- char* pHome = getpwuid(getuid())->pw_dir;
-- strcat(lnkFilePath, pHome);
-- strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
--
-- struct stat sBuf;
-- if (0 > lstat(lnkFilePath, &sBuf))
-- return false;
-- if (!S_ISLNK(sBuf.st_mode))
-- return false;
-- if (0 >= readlink(lnkFilePath, lnkReferFilePath, NPP_PATH_MAX))
-- return false;
-- // If the link is relative, then we regard it as non-standard
-- if (lnkReferFilePath[0] != '/')
-- return false;
--
-- // get the real file path
-- char realFilePath[NPP_PATH_MAX] = {0};
-- ::rtl::OString tempString;
-- if (!getDllURL(&tempString)) {
-- return false;
-- }
-- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-- strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION);
--
-- if (0 != strcmp(lnkReferFilePath, realFilePath))
-- return false;
-- return true;
--#endif
--#ifdef WNT
-- // get the value from registry
-- BOOL ret = true;
-- ::rtl::OString tempString;
-- char realFilePath[NPP_PATH_MAX] = {0};
-- if (!getDllURL(&tempString)){
-- return false;
-- }
-- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-- if(! lc_isInstalled(realFilePath))
-- ret =true;
-- else
-- ret = false;
-- return ret;
--#endif
--}
--
--BOOL MozPluginTabPage::installPlugin()
--{
--#ifdef UNIX
-- // get the real file referred by .so lnk file
-- char lnkFilePath[NPP_PATH_MAX] = {0};
-- char* pHome = getpwuid(getuid())->pw_dir;
-- strcat(lnkFilePath, pHome);
-- strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
-- remove(lnkFilePath);
--
-- // create the dirs if necessary
-- struct stat buf;
-- char tmpDir[NPP_PATH_MAX] = {0};
-- sprintf(tmpDir, "%s/.mozilla", pHome);
-- if (0 > stat(lnkFilePath, &buf))
-- {
-- mkdir(tmpDir, 0755);
-- strcat(tmpDir, "/plugins");
-- mkdir(tmpDir, 0755);
-- }
--
-- // get the real file path
-- char realFilePath[NPP_PATH_MAX] = {0};
-- ::rtl::OString tempString;
-- if (!getDllURL(&tempString)) {
-- return false;
-- }
-- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-- strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION);
--
-- // create the link
-- if (0 != symlink(realFilePath, lnkFilePath))
-- return false;
-- return true;
--#endif
--#ifdef WNT
-- ::rtl::OString tempString;
-- char realFilePath[NPP_PATH_MAX] = {0};
-- if (!getDllURL(&tempString)) {
-- return false;
-- }
-- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-- if( !lc_installPlugin(realFilePath))
-- return true;
-- else
-- return false;
--#endif
--}
--
--BOOL MozPluginTabPage::uninstallPlugin()
--{
--#ifdef UNIX
-- // get the real file referred by .so lnk file
-- char lnkFilePath[NPP_PATH_MAX] = {0};
-- char* pHome = getpwuid(getuid())->pw_dir;
-- strcat(lnkFilePath, pHome);
-- strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
--
-- if(0 > remove(lnkFilePath))
-- return false;
-- return true;
--#endif
--#ifdef WNT
-- ::rtl::OString tempString;
-- char realFilePath[NPP_PATH_MAX] = {0};
-- if (!getDllURL(&tempString)) {
-- return false;
-- }
-- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-- if(!lc_uninstallPlugin(realFilePath))
-- return true;
-- else
-- return false;
--#endif
--}
--//added by jmeng end
--
- /* -------------------------------------------------------------------------*/
-
- class MailerProgramCfg_Impl : public utl::ConfigItem
-Index: svx/source/dialog/optinet2.hxx
-===================================================================
---- svx/source/cui/optinet2.hxx 2008-12-31 18:06:28.000000000 +0100
-+++ svx/source/cui/optinet2.hxx 2008-12-31 18:07:48.000000000 +0100
-@@ -292,29 +292,6 @@
- virtual void Reset( const SfxItemSet& rSet );
- };
-
--//added by jmeng begin
--class MozPluginTabPage : public SfxTabPage
--{
-- FixedLine aMSWordGB;
-- CheckBox aWBasicCodeCB;
--
-- BOOL isInstalled(void);
-- BOOL installPlugin(void);
-- BOOL uninstallPlugin(void);
--
-- MozPluginTabPage( Window* pParent, const SfxItemSet& rSet );
-- virtual ~MozPluginTabPage();
--
--public:
--
-- static SfxTabPage* Create( Window* pParent,
-- const SfxItemSet& rAttrSet );
--
-- virtual BOOL FillItemSet( SfxItemSet& rSet );
-- virtual void Reset( const SfxItemSet& rSet );
--
--};
--//added by jmeng end
- #endif
-
- /* -----------------------------20.06.01 16:32--------------------------------
Index: svx/source/dialog/treeopt.cxx
===================================================================
---- svx/source/cui/treeopt.cxx 2008-12-31 18:07:20.000000000 +0100
-+++ svx/source/cui/treeopt.cxx 2008-12-31 18:07:48.000000000 +0100
-@@ -369,9 +369,6 @@
- case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate = &SvxAccessibilityOptionsTabPage::Create; break;
- case RID_SVXPAGE_SSO: fnCreate = GetSSOCreator(); break;
- case RID_SVXPAGE_OPTIONS_CTL: fnCreate = &SvxCTLOptionsPage::Create ; break;
-- //added by jmeng begin
-- case RID_SVXPAGE_INET_MOZPLUGIN: fnCreate = &MozPluginTabPage::Create; break;
-- //added by jmeng end
- case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break;
- case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break;
- case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break;
-@@ -419,7 +416,6 @@
- { "Internet", "Proxy", RID_SVXPAGE_INET_PROXY },
- { "Internet", "Search", RID_SVXPAGE_INET_SEARCH },
- { "Internet", "Email", RID_SVXPAGE_INET_MAIL },
-- { "Internet", "MozillaPlugin", RID_SVXPAGE_INET_MOZPLUGIN },
- { "LoadSave", NULL, SID_FILTER_DLG },
- { "LoadSave", "General", RID_SFXPAGE_SAVE },
- { "LoadSave", "VBAProperties", SID_OPTFILTER_MSOFFICE },
-Index: svx/source/dialog/treeopt.src
-===================================================================
---- svx/source/cui/treeopt.src 2008-12-31 18:06:47.000000000 +0100
-+++ svx/source/cui/treeopt.src 2008-12-31 18:07:48.000000000 +0100
-@@ -187,7 +187,6 @@
- < "Proxy" ; RID_SVXPAGE_INET_PROXY; > ;
- < "Search" ; RID_SVXPAGE_INET_SEARCH; > ;
- < "E-mail" ; RID_SVXPAGE_INET_MAIL; > ;
-- < "Browser Plug-in" ; RID_SVXPAGE_INET_MOZPLUGIN; > ;
- };
- //modified by jmeng end
- };
-Index: svx/source/options/optinet2.src
-===================================================================
---- svx/source/options/optinet2.src 2008-12-31 18:06:37.000000000 +0100
-+++ svx/source/options/optinet2.src 2008-12-31 18:07:48.000000000 +0100
-@@ -40,32 +40,6 @@
- /* */
- /************************************************************************/
-
--// added by jmeng begin
--
--TabPage RID_SVXPAGE_INET_MOZPLUGIN
--{
-- OutputSize = TRUE ;
-- Size = MAP_APPFONT ( 260 , 185 ) ;
-- SVLook = TRUE ;
-- Hide = TRUE ;
--
-- FixedLine GB_MOZPLUGIN
-- {
-- Pos = MAP_APPFONT ( 6 , 3 ) ;
-- Size = MAP_APPFONT ( 248 , 8 ) ;
-- Text[ en-US ] = "Browser Plug-in";
-- };
-- CheckBox CB_MOZPLUGIN_CODE
-- {
-- Pos = MAP_APPFONT ( 12 , 14 ) ;
-- Size = MAP_APPFONT ( 236 , 10 ) ;
-- TabStop = TRUE ;
-- Text [ en-US ] = "~Display documents in browser" ;
-- };
--};
--
--//added by jmeng end
--
- TabPage RID_SVXPAGE_INET_PROXY
- {
- HelpId = HID_OPTIONS_PROXY ;
+--- svx/source/cui/treeopt.cxx (Revision 277995)
++++ svx/source/cui/treeopt.cxx (Arbeitskopie)
+@@ -2204,11 +2204,9 @@
+ if ( nPageId == RID_SVXPAGE_INET_MAIL )
+ continue;
+ #endif
+-#if defined MACOSX
+- // Disable Mozilla Plug-in tab-page on Mac
++ // Disable Mozilla Plug-in tab-page
+ if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN )
+ continue;
+-#endif
+ AddTabPage( nPageId, rInetArray.GetString(i), nGroup );
+ }
+ }
More information about the ooo-build-commit
mailing list