[ooo-build-commit] 7 commits - bin/setup.in bin/unpack configure.in download.in patches/dev300
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Sun Dec 20 08:57:26 PST 2009
bin/setup.in | 1
bin/unpack | 7 +++++
configure.in | 18 +++++++++++++
download.in | 7 +++++
patches/dev300/apply | 6 ++--
patches/dev300/extensions_configure.diff | 23 ++++++++++++++--
patches/dev300/extensions_packinfo.diff | 18 ++++++++++++-
patches/dev300/scp2_extensions.diff | 42 ++++++++++++++++++++++++++++---
8 files changed, 112 insertions(+), 10 deletions(-)
New commits:
commit af81304cdca74ad6f126c0c104114e126029417e
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Dec 20 17:55:15 2009 +0100
Temporary fix for OxygenOffice to use the new layout engine
* patches/dev300/apply:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index e93aac6..2cd1aad 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -138,7 +138,7 @@ Solaris: NovellBase, UnstableExtensions
# Universal Upstream-like packages
GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions, GoOoSplash
# OxygenOffice Professional
-OxygenOfficeLinuxCommon : Common, EMFPlus, LayoutDialogs, FontConfigTemporaryHacks, \
+OxygenOfficeLinuxCommon : Common, EMFPlus, FontConfigTemporaryHacks, \
LinuxOnly, SystemBits, Lockdown, \
msaccess, OpenGLTransitions, \
Fpickers, Mono, AddressBooks, QuickStarter, KDE4, IntegrateExtensions, LiberationFontsOnWindows
commit 7109009fe261b017f89fa456912ef7328f71adef
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Dec 20 17:53:15 2009 +0100
Add Watch Window extension to unpack
* bin/unpack:
diff --git a/bin/unpack b/bin/unpack
index 65001b8..97acdb2 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -873,6 +873,13 @@ if test "x$NUMBERTEXT_EXTENSION" != "x"; then
$GNUCP $SRCDIR/$NUMBERTEXT_EXTENSION -d $OOBUILDDIR/extras/source/extensions || exit 1
fi
+if test "x$WATCH_WINDOW_EXTENSION" != "x"; then
+ check_file $SRCDIR/$WATCH_WINDOW_EXTENSION
+ echo "Copying Google Docs extension into the tree"
+ mkdir -p $OOBUILDDIR/extras/source/extensions/ || exit 1
+ $GNUCP $SRCDIR/$WATCH_WINDOW_EXTENSION -d $OOBUILDDIR/extras/source/extensions || exit 1
+fi
+
if test "x$GOOGLE_DOCS_EXTENSION" != "x"; then
check_file $SRCDIR/$GOOGLE_DOCS_EXTENSION
echo "Copying Google Docs extension into the tree"
commit 9e670e50b0f2e66e32f060612516fc53a15608c8
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Dec 20 13:32:26 2009 +0100
Watch Window extension fix
* patches/dev300/extensions_configure.diff:
diff --git a/patches/dev300/extensions_configure.diff b/patches/dev300/extensions_configure.diff
index 1a1d754..75aea13 100644
--- a/patches/dev300/extensions_configure.diff
+++ b/patches/dev300/extensions_configure.diff
@@ -131,9 +131,9 @@
+AC_MSG_CHECKING([for Watch Window extension integration])
+if test "z$with_watch_window" = "z" -o "z$with_watch_window" = "zno" ; then
+ AC_MSG_RESULT([no])
-+ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_WATCH_WINDOW"
+else
+ AC_MSG_RESULT([yes])
++ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_WATCH_WINDOW"
+fi
+AC_SUBST(WITH_WATCH_WINDOW_EXTENSION)
+
commit b0401fa4a66fc6708bd3f5e712f84f347bb7d90c
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Dec 20 13:28:12 2009 +0100
Fix for Watch Window extension
* patches/dev300/extensions_configure.diff:
diff --git a/patches/dev300/extensions_configure.diff b/patches/dev300/extensions_configure.diff
index 4ca5f1c..1a1d754 100644
--- a/patches/dev300/extensions_configure.diff
+++ b/patches/dev300/extensions_configure.diff
@@ -131,7 +131,7 @@
+AC_MSG_CHECKING([for Watch Window extension integration])
+if test "z$with_watch_window" = "z" -o "z$with_watch_window" = "zno" ; then
+ AC_MSG_RESULT([no])
-+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_WATCH_WINDOW"
++ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_WATCH_WINDOW"
+else
+ AC_MSG_RESULT([yes])
+fi
commit 3cbb9fd2c621e0dd8232b8355bdc3011f9b877a1
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Dec 19 11:54:26 2009 +0100
Configure text fix NLPSolver -> oooblogger at oooblogger
* patches/dev300/extensions_configure.diff:
diff --git a/patches/dev300/extensions_configure.diff b/patches/dev300/extensions_configure.diff
index 1ca8d04..4ca5f1c 100644
--- a/patches/dev300/extensions_configure.diff
+++ b/patches/dev300/extensions_configure.diff
@@ -175,7 +175,7 @@
+dnl ===================================================================
+dnl Test whether to include oooblogger extension
+dnl ===================================================================
-+AC_MSG_CHECKING([for NLPSolver extension integration])
++AC_MSG_CHECKING([for oooblogger extension integration])
+if test "z$with_oooblogger" = "z" -o "z$with_oooblogger" = "zno" ; then
+ AC_MSG_RESULT([no])
+else
commit 1933a799dd47ef8e4637d2c210636283300b3b88
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Dec 19 09:41:20 2009 +0100
Add some new settings to OxygenOffice configuration
* patches/dev300/apply:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index d0b518a..e93aac6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -139,9 +139,9 @@ Solaris: NovellBase, UnstableExtensions
GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions, GoOoSplash
# OxygenOffice Professional
OxygenOfficeLinuxCommon : Common, EMFPlus, LayoutDialogs, FontConfigTemporaryHacks, \
- LinuxOnly, SystemBits, \
+ LinuxOnly, SystemBits, Lockdown, \
msaccess, OpenGLTransitions, \
- Fpickers, Mono, AddressBooks, QuickStarter, IntegrateExtensions, LiberationFontsOnWindows
+ Fpickers, Mono, AddressBooks, QuickStarter, KDE4, IntegrateExtensions, LiberationFontsOnWindows
OxygenOfficeMacOSXCommon : Common, SystemBits, IntegrateExtensions, LiberationFontsOnWindows, OOXMLExport
OxygenOfficeWin32Common : Common, Win32Only, NotDebian, IntegrateExtensions, LiberationFontsOnWindows
commit 9a98286f4a4a81f2c26b80e191913bd6eccca679
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Dec 19 09:37:16 2009 +0100
Include Watch Window extension for Calc
A Watch Window is a separate, small window that remains
"on top" and enables users to monitor a selected set of
cells.
You need enabled extension integration, then you can use
--with-watch-window option during configure.
* bin/setup.in:
* configure.in:
* download.in:
* patches/dev300/extensions_configure.diff:
* patches/dev300/extensions_packinfo.diff:
* patches/dev300/scp2_extensions.diff:
diff --git a/bin/setup.in b/bin/setup.in
index 843c578..9f7e26b 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -34,6 +34,7 @@ OOOP_SAMPLES_PACK='@OOOP_SAMPLES_PACK@'
OOOP_TEMPLATES_PACK='@OOOP_TEMPLATES_PACK@'
LIGHTPROOF_EXTENSION='@LIGHTPROOF_EXTENSION@'
NUMBERTEXT_EXTENSION='@NUMBERTEXT_EXTENSION@'
+WATCH_WINDOW_EXTENSION='@WATCH_WINDOW_EXTENSION@'
GOOGLE_DOCS_EXTENSION='@GOOGLE_DOCS_EXTENSION@'
NLPSOLVER_EXTENSION='@NLPSOLVER_EXTENSION@'
OOOBLOGGER_EXTENSION='@OOOBLOGGER_EXTENSION@'
diff --git a/configure.in b/configure.in
index 1014665..5b59ee0 100644
--- a/configure.in
+++ b/configure.in
@@ -344,6 +344,10 @@ AC_ARG_WITH(sun-templates,
--with-sun-templates Download and integrate Sun template packages.],
,)
+AC_ARG_WITH(watch-window,
+[
+ --with-watch-window Download and integrate Watch Window extension to Calc.],
+,)
AC_ARG_WITH(google-docs,
[
@@ -1331,6 +1335,20 @@ else
fi
AC_SUBST(SUNTEMPLATES_LANG)
+AC_MSG_CHECKING([whether to include Watch Window extension for Calc])
+if test "$enable_extensions" != "no" ; then
+ if test "z$with_watch_window" = "zyes" ; then
+ WATCH_WINDOW_EXTENSION="WatchWindow_1.0.0.oxt"
+ WITH_WATCH_WINDOW=YES
+ AC_MSG_RESULT([yes])
+ else
+ WITH_WATCH_WINDOW=NO
+ AC_MSG_RESULT([no])
+ fi
+fi
+AC_SUBST(WITH_WATCH_WINDOW)
+AC_SUBST(WATCH_WINDOW_EXTENSION)
+
AC_MSG_CHECKING([whether to include Google Docs extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_google_docs" = "zyes" ; then
diff --git a/download.in b/download.in
index 159c749..d3b505f 100755
--- a/download.in
+++ b/download.in
@@ -149,6 +149,9 @@ sub trim($)
# Numbertext extension
'numbertext-*' => 'http://ftp.devall.hu/kami/go-oo/',
+# Watch Window extension
+ 'WatchWindow*' => 'http://ftp.devall.hu/kami/go-oo/',
+
# Google Docs Extension
'gdocs*' => 'http://download.go-oo.org/src/',
@@ -477,6 +480,10 @@ if ('@NUMBERTEXT_EXTENSION@' ne '') {
source_file( '@NUMBERTEXT_EXTENSION@' );
}
+if ('@WATCH_WINDOW_EXTENSION@' ne '') {
+ source_file( '@WATCH_WINDOW_EXTENSION@' );
+}
+
if ('@GOOGLE_DOCS_EXTENSION@' ne '') {
source_file( '@GOOGLE_DOCS_EXTENSION@' );
}
diff --git a/patches/dev300/extensions_configure.diff b/patches/dev300/extensions_configure.diff
index d95f249..1ca8d04 100644
--- a/patches/dev300/extensions_configure.diff
+++ b/patches/dev300/extensions_configure.diff
@@ -14,7 +14,7 @@
AC_ARG_WITH(fonts,
[ --without-fonts OOo includes some third-party fonts to provide a reliable
basis for help content, templates, samples, etc.
-@@ -829,6 +836,36 @@ AC_ARG_WITH(alloc,
+@@ -829,6 +836,41 @@ AC_ARG_WITH(alloc,
[ --with-alloc Define which allocator to build with
(choices are oo, system, tcmalloc)
],,)
@@ -33,6 +33,11 @@
+ --with-numbertext Integrate Numbertext extension],
+,)
+
++AC_ARG_WITH(watch-window,
++[
++ --with-watch-window Integrate Watch Window extension to Calc],
++,)
++
+AC_ARG_WITH(google-docs,
+[
+ --with-google-docs Download and integrate Google Documents extension.],
@@ -91,7 +96,7 @@
SYSTEM_JFREEREPORT=NO
fi
AC_SUBST(ENABLE_REPORTBUILDER)
-@@ -6609,6 +6646,110 @@ else
+@@ -6609,6 +6644,122 @@ else
fi
dnl ===================================================================
@@ -121,6 +126,18 @@
+AC_SUBST(WITH_LIGHTPROOF_EXTENSION)
+
+dnl ===================================================================
++dnl Test whether to include Watch Window extension
++dnl ===================================================================
++AC_MSG_CHECKING([for Watch Window extension integration])
++if test "z$with_watch_window" = "z" -o "z$with_watch_window" = "zno" ; then
++ AC_MSG_RESULT([no])
++ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_WATCH_WINDOW"
++else
++ AC_MSG_RESULT([yes])
++fi
++AC_SUBST(WITH_WATCH_WINDOW_EXTENSION)
++
++dnl ===================================================================
+dnl Test whether to include Numbertext extension
+dnl ===================================================================
+AC_MSG_CHECKING([for Numbertext extension integration])
diff --git a/patches/dev300/extensions_packinfo.diff b/patches/dev300/extensions_packinfo.diff
index 521cd80..4bcd2b2 100644
--- a/patches/dev300/extensions_packinfo.diff
+++ b/patches/dev300/extensions_packinfo.diff
@@ -1,6 +1,6 @@
--- setup_native/source/packinfo/packinfo_extensions.txt.orig 2008-01-14 20:09:47.000000000 +0100
+++ setup_native/source/packinfo/packinfo_extensions.txt 2008-03-29 11:00:24.000000000 +0100
-@@ -0,0 +1,177 @@
+@@ -0,0 +1,193 @@
+# Format:
+
+# Start
@@ -132,6 +132,22 @@
+End
+
+Start
++module = "gid_Module_Optional_Extensions_Watch_Window"
++script = "shellscripts_extensions.txt"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-watch-window"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-watch-window"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
++linuxpatchrequires = ""
++copyright = "2009 by Tibor Hornyák"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "Watch Window extension for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%PACKAGEVERSION"
++End
++
++Start
+module = "gid_Module_Optional_Extensions_Google_Docs"
+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-google-docs"
diff --git a/patches/dev300/scp2_extensions.diff b/patches/dev300/scp2_extensions.diff
index a9a092b..14955c1 100644
--- a/patches/dev300/scp2_extensions.diff
+++ b/patches/dev300/scp2_extensions.diff
@@ -1,6 +1,6 @@
--- scp2/source/extensions/file_extensions.scp.old 2009-10-27 15:31:48.000000000 +0100
+++ scp2/source/extensions/file_extensions.scp 2009-10-27 15:36:41.000000000 +0100
-@@ -0,0 +1,187 @@
+@@ -0,0 +1,200 @@
+/*************************************************************************
+*
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -131,6 +131,19 @@
+
+#endif
+
++/* ** Watch Window ** */
++
++#ifdef WITH_EXTENSION_WATCH_WINDOW
++
++File gid_File_Oxt_Watch_Window
++ TXT_FILE_BODY;
++ Styles = (PACKED);
++ Dir = gid_Brand_Dir_Share_Extension_Install;
++ Name = "WatchWindow_1.0.0.oxt";
++End
++
++#endif
++
+/* ** Google Docs ** */
+
+#ifdef WITH_EXTENSION_GOOGLE_DOCS
@@ -251,7 +264,7 @@
+.INCLUDE : target.mk
--- scp2/source/extensions/module_extensions.scp.old 2009-10-27 15:31:48.000000000 +0100
+++ scp2/source/extensions/module_extensions.scp 2009-10-27 15:40:55.000000000 +0100
-@@ -0,0 +1,234 @@
+@@ -0,0 +1,251 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -417,6 +430,23 @@
+#endif
+#endif
+
++/* ** Watch Window ** */
++
++#ifdef WITH_EXTENSION_WATCH_WINDOW
++#ifdef WITH_EXTENSION_INTEGRATION
++Module gid_Module_Optional_Extensions_Watch_Window
++ PackageInfo = "packinfo_extensions.txt";
++ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW);
++ ParentID = gid_Module_Optional_Extensions;
++ Files = (
++ gid_File_Oxt_Watch_Window );
++ Minimal = NO;
++ Default = YES;
++ Styles = ( );
++End
++#endif
++#endif
++
+/* ** Google Docs ** */
+
+#ifdef WITH_EXTENSION_GOOGLE_DOCS
@@ -547,7 +577,7 @@
+#endif
--- scp2/source/extensions/module_extensions.ulf.old 2009-10-27 15:31:48.000000000 +0100
+++ scp2/source/extensions/module_extensions.ulf 2009-10-27 15:50:25.000000000 +0100
-@@ -0,0 +1,766 @@
+@@ -0,0 +1,772 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -631,6 +661,12 @@
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
+en-US = "Numbertext"
+
++[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW]
++en-US = "Watch Window"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW]
++en-US = "Watch Window"
++
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS]
+en-US = "Google Docs & Zoho"
+
More information about the ooo-build-commit
mailing list