[ooo-build-commit] .: patches/dev300
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Sep 14 11:52:31 PDT 2010
patches/dev300/apply | 10 --
patches/dev300/default-no-startup-wizard.diff | 59 ---------------
patches/dev300/desktop-config-migration.diff | 14 ---
patches/dev300/desktop-disable-startup-registration.diff | 35 --------
patches/dev300/kde4-buildfix-connectivity.diff | 28 -------
5 files changed, 146 deletions(-)
New commits:
commit 503f79703a8fa270a3fc450c646e293487c75886
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Sep 14 20:42:42 2010 +0200
Migrate the 'kill first start wizard' patches, and a KDE4 buildfix.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ff5a840..ed0ca7f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -802,9 +802,6 @@ document-password-change-sfx2.diff, kohei
# remove updater code that is only relevant for the upstream version.
sfx2-remove-check-update-on-fileload.diff, kohei
-# prevent the registration dialog from showing up on startup.
-desktop-disable-startup-registration.diff, kohei
-
[ EasterEgg ]
# go-oo.org people active in this release
@@ -1062,9 +1059,6 @@ recovery-report.diff, i#53531, martink
# Controversial bits - no use filing up-stream
#
-# automatically do any migration we can, with no wizard
-default-no-startup-wizard.diff, michael
-
# don't throw up the style dialog on 1st run
default-no-style-dialog.diff, michael
@@ -1933,10 +1927,6 @@ gcc-4.3-postgresql.diff
sdbc-postgresql-config_office.diff
[ KDE4 ]
-# FIXME: still needed?
-kde4-buildfix-connectivity.diff
-
-[ KDE4 ]
# Further fixes on top of existing kde4 support
# upstreamed in m65
# FIXME dev300-m77 kde4_fpicker_fixes.diff #disabled
diff --git a/patches/dev300/default-no-startup-wizard.diff b/patches/dev300/default-no-startup-wizard.diff
deleted file mode 100644
index d9769a2..0000000
--- a/patches/dev300/default-no-startup-wizard.diff
+++ /dev/null
@@ -1,59 +0,0 @@
----
- desktop/source/migration/wizard.cxx | 8 +++++++-
- scp2/source/ooo/common_brand.scp | 7 +------
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git desktop/source/migration/wizard.cxx desktop/source/migration/wizard.cxx
-index 92e905a..4954704 100644
---- desktop/source/migration/wizard.cxx
-+++ desktop/source/migration/wizard.cxx
-@@ -141,6 +141,8 @@ FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAccep
- ,m_bAutomaticUpdChk(sal_True)
- ,m_aLicensePath( rLicensePath )
- {
-+ return;
-+
- // ---
- // FreeResource();
- // enableState(STATE_USER, sal_False);
-@@ -451,7 +453,11 @@ sal_Bool FirstStartWizard::onFinish()
-
- short FirstStartWizard::Execute()
- {
-- return svt::RoadmapWizard::Execute();
-+ disableWizard();
-+ if ( Migration::checkMigration() )
-+ Migration::doMigration();
-+
-+ return sal_True;
- }
-
- static OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False)
-diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp
-index 0b235a0..fdd03fa 100644
---- scp2/source/ooo/common_brand.scp
-+++ scp2/source/ooo/common_brand.scp
-@@ -840,19 +840,14 @@ ProfileItem gid_Brand_Profileitem_Soffice_NativeProgress_So
- Value = "${NATIVEPROGRESS}";
- End
-
--#ifdef WNT
- ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
- ProfileID = gid_Brand_Profile_Soffice_Ini;
- ModuleID = gid_Module_Root_Brand;
- Section = "Bootstrap";
- Order = 7;
- Key = "HideEula";
-- Value = "[HIDEEULA]";
-- Inifiletablekey = "HideEula";
-- Inifiletableaction = "1";
-- Styles = (INIFILETABLE);
-+ Value = "1";
- End
--#endif
-
- #ifdef WNT
- ProfileItem gid_Brand_Profileitem_Soffice_Startlang
---
-1.7.0.1
-
diff --git a/patches/dev300/desktop-config-migration.diff b/patches/dev300/desktop-config-migration.diff
index fc980e8..dc48636 100644
--- a/patches/dev300/desktop-config-migration.diff
+++ b/patches/dev300/desktop-config-migration.diff
@@ -10,20 +10,6 @@ Subject: [PATCH 237/768] desktop-config-migration.diff
officecfg/registry/schema/org/openoffice/Setup.xcs | 8 +
4 files changed, 328 insertions(+), 50 deletions(-)
-diff --git desktop/source/app/app.cxx desktop/source/app/app.cxx
-index 1cf7009..2bb2fe5 100644
---- desktop/source/app/app.cxx
-+++ desktop/source/app/app.cxx
-@@ -1439,6 +1439,9 @@ void Desktop::Main()
- }
- #endif
-
-+ if (Migration::checkMigration())
-+ Migration::doMigration();
-+
- // keep a language options instance...
- pLanguageOptions.reset( new SvtLanguageOptions(sal_True));
-
diff --git desktop/source/migration/migration.cxx desktop/source/migration/migration.cxx
index ede233e..c4163ee 100644
--- desktop/source/migration/migration.cxx
diff --git a/patches/dev300/desktop-disable-startup-registration.diff b/patches/dev300/desktop-disable-startup-registration.diff
deleted file mode 100644
index 3374b4c..0000000
--- a/patches/dev300/desktop-disable-startup-registration.diff
+++ /dev/null
@@ -1,35 +0,0 @@
----
- desktop/source/app/app.cxx | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git desktop/source/app/app.cxx desktop/source/app/app.cxx
-index 4be2222..367436f 100644
---- desktop/source/app/app.cxx
-+++ desktop/source/app/app.cxx
-@@ -45,6 +45,7 @@
- #include "desktopcontext.hxx"
- #include "exithelper.hxx"
- #include "../migration/pages.hxx"
-+#include "../migration/migration.hxx"
-
- #include <svtools/javacontext.hxx>
- #include <com/sun/star/frame/XSessionManagerListener.hpp>
-@@ -1421,6 +1422,7 @@ void Desktop::Main()
- bool bAbort = CheckExtensionDependencies();
- if ( bAbort )
- return;
-+#if 0 // ooo-build doesn't use First Start Wizard at all.
- // First Start Wizard allowed ?
- if ( ! pCmdLineArgs->IsNoFirstStartWizard())
- {
-@@ -1452,6 +1454,7 @@ void Desktop::Main()
-
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "} FirstStartWizard" );
- }
-+#endif
-
- // keep a language options instance...
- pLanguageOptions.reset( new SvtLanguageOptions(sal_True));
---
-1.7.0.1
-
diff --git a/patches/dev300/kde4-buildfix-connectivity.diff b/patches/dev300/kde4-buildfix-connectivity.diff
deleted file mode 100644
index 32e7533..0000000
--- a/patches/dev300/kde4-buildfix-connectivity.diff
+++ /dev/null
@@ -1,28 +0,0 @@
----
- connectivity/source/drivers/kab/makefile.mk | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git connectivity/source/drivers/kab/makefile.mk connectivity/source/drivers/kab/makefile.mk
-index 2a0dc5c..5e32a5d 100644
---- connectivity/source/drivers/kab/makefile.mk
-+++ connectivity/source/drivers/kab/makefile.mk
-@@ -106,14 +106,14 @@ SHL2VERSIONMAP=$(TARGET2).map
-
- SHL2TARGET= $(TARGET2)$(KAB_MAJOR)
- SHL2OBJS=$(SLO2FILES)
-+SHL2LINKFLAGS+=$(KAB_LIB)
- SHL2STDLIBS=\
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(VOSLIB) \
- $(SALLIB) \
- $(DBTOOLSLIB) \
-- $(COMPHELPERLIB) \
-- $(KAB_LIB)
-+ $(COMPHELPERLIB)
-
- SHL2DEPN=
- SHL2IMPLIB= i$(TARGET2)
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list