ooo-build r14257 - in branches/ooo-build-3-0: . patches/dev300
- From: szalaik svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14257 - in branches/ooo-build-3-0: . patches/dev300
- Date: Thu, 9 Oct 2008 08:18:00 +0000 (UTC)
Author: szalaik
Date: Thu Oct 9 08:17:59 2008
New Revision: 14257
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14257&view=rev
Log:
2008-10-09 Kalman Szalai - KAMI <kamihir freemail hu>
* patches/dev300/apply
* patches/dev300/scp2_accessories.diff
* patches/dev300/pdfimport-system-poppler.diff
Fine tuning accessories and enable Extensions integration.
I forgot to commit this patch for a while.
Modified:
branches/ooo-build-3-0/ChangeLog
branches/ooo-build-3-0/patches/dev300/apply
branches/ooo-build-3-0/patches/dev300/pdfimport-system-poppler.diff
branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff
Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply (original)
+++ branches/ooo-build-3-0/patches/dev300/apply Thu Oct 9 08:17:59 2008
@@ -17,7 +17,7 @@
Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
OOXML, SVGImport, AutoCorrectCapsLock, UnitTesting, \
CalcDataPilotDrillDown, PopupRemoval, LinkWarningDlg, RadioButtons, InternalCairo, \
- FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs
+ FedoraCommonFixes, InternalMesaHeaders, IntegrateExtensions, OxygenOfficeExtrasCommon, LayoutDialogs
LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
@@ -131,9 +131,9 @@
OxygenOfficeLinuxCommon : Common, EMFPlus, LayoutDialogs, FontConfigTemporaryHacks, \
LinuxOnly, SystemBits, \
msaccess, OpenGLTransitions, \
- Fpickers, Mono, AddressBooks, QuickStarter, IntegrateExtensions, DejaVuFonts
-OxygenOfficeMacOSXCommon : Common, SystemBits, IntegrateExtensions, DejaVuFonts
-OxygenOfficeWin32Common : Common, Win32Only, NotDebian, IntegrateExtensions, DejaVuFonts
+ Fpickers, Mono, AddressBooks, QuickStarter, DejaVuFonts
+OxygenOfficeMacOSXCommon : Common, SystemBits, DejaVuFonts
+OxygenOfficeWin32Common : Common, Win32Only, NotDebian, DejaVuFonts
OxygenOfficeLinux: OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
OxygenOfficeWindows: OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
@@ -2363,7 +2363,7 @@
#Always use default iconset
always_default_iconset.diff
-[ OxygenOfficeExtras ]
+[ OxygenOfficeExtrasCommon ]
# Adding new items to extras module
accessories_build.diff
accessories_target.diff
@@ -2389,6 +2389,8 @@
extras_solenv.diff
extras_wizard.diff
extras_fonts.diff
+
+[ OxygenOfficeExtras ]
# Add our macros stuffs to wizard module
premium_macro_build.diff
premium_macro_dialog.diff
Modified: branches/ooo-build-3-0/patches/dev300/pdfimport-system-poppler.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/pdfimport-system-poppler.diff (original)
+++ branches/ooo-build-3-0/patches/dev300/pdfimport-system-poppler.diff Thu Oct 9 08:17:59 2008
@@ -10,7 +10,7 @@
AC_ARG_WITH(system-db,
[ --with-system-db Use berkeley db already on system
],,)
-@@ -5387,20 +5387,34 @@ AC_SUBST(ENABLE_PRESENTER_SCREEN)
+@@ -5387,20 +5387,35 @@ AC_SUBST(ENABLE_PRESENTER_SCREEN)
AC_MSG_CHECKING([whether to build the PDF Import extension])
if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
Modified: branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff (original)
+++ branches/ooo-build-3-0/patches/dev300/scp2_accessories.diff Thu Oct 9 08:17:59 2008
@@ -1432,7 +1432,7 @@
diff -Naur scp2/source/accessories/module_accessories.scp scp2/source/accessories/module_accessories.scp
--- scp2/source/accessories/module_accessories.scp 1970-01-01 01:00:00.000000000 +0100
+++ scp2/source/accessories/module_accessories.scp 2008-03-22 10:57:33.000000000 +0100
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -1473,8 +1473,11 @@
+Module gid_Module_Optional_Accessories
+ ParentID = gid_Module_Optional;
+ Files = (
++#ifndef WITHOUT_EXTRA_ACCESSORY
+ gid_File_Basic_Premium,
-+ gid_File_Basic_OOoWikipedia );
++ gid_File_Basic_OOoWikipedia
++#endif
++ );
+ XPDParentID = "root";
+ Sortkey = "300";
+ Minimal = NO;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]