[Libreoffice-commits] .: 10 commits - instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo scp2/source solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Nov 16 00:41:37 PST 2010
instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt | 2 ++
instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt | 6 ++++--
instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt | 2 ++
instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt | 6 ++++--
scp2/source/binfilter/module_binfilter.scp | 2 +-
scp2/source/ooo/file_ooo.scp | 2 +-
scp2/source/templates/module_langpack_binfilter.sct | 2 +-
solenv/inc/minor.mk | 4 ++--
8 files changed, 17 insertions(+), 9 deletions(-)
New commits:
commit 9a0390cd709ddfad2bfbd3d6711699d2b8fe41ed
Merge: b223aca... 5efe8d6...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Nov 16 09:39:19 2010 +0100
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/bootstrap
commit b223aca41041a6e59c171209a0059011aef93a93
Merge: 4d6528e... a4426b8...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Nov 16 09:08:19 2010 +0100
Merge remote branch 'origin/libreoffice-3-3'
commit a4426b80d1fa85d63f43bdfb51c89b2d556bae66
Merge: cfe4ec5... 65adbdf...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Nov 16 09:00:32 2010 +0100
Merge commit 'ooo/OOO330_m15' into libreoffice-3-3
Conflicts:
instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
solenv/inc/minor.mk
diff --cc instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 2c35173,661b9a4..c082322
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@@ -1,5 -1,7 +1,7 @@@
Signature_ Root Key Name Type
s72 i2 s255 S255 I2
RegLocator Signature_
- installuser 1 Software\LibreOffice\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
- installmachine 2 Software\LibreOffice\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installuser 1 Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installuser_ 1 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installmachine 2 Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installmachine_ 2 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
++installuser 1 Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
++installuser_ 1 Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
++installmachine 2 Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
++installmachine_ 2 Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
diff --cc instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
index d2b2333,072fdcf..995f919
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
@@@ -1,5 -1,7 +1,7 @@@
Signature_ Root Key Name Type
s72 i2 s255 S255 I2
RegLocator Signature_
- basisinstalluser 1 Software\LibreOffice\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
- basisinstallmachine 2 Software\LibreOffice\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstalluser 1 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstalluser_ 1 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstallmachine 2 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstallmachine_ 2 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
++basisinstalluser 1 Software\LibreOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
++basisinstalluser_ 1 Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
++basisinstallmachine 2 Software\LibreOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
++basisinstallmachine_ 2 Software\LibreOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
diff --cc solenv/inc/minor.mk
index c6e863e,e22bfc3..94f8dc2
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
RSCVERSION=330
- RSCREVISION=330m14(Build:1)
-RSCREVISION=330m15(Build:9546)
-BUILD=9546
++RSCREVISION=330m15(Build:1)
+BUILD=1
- LAST_MINOR=m14
+ LAST_MINOR=m15
SOURCEVERSION=OOO330
commit cfe4ec5dc3957f93a78f51edee1adc94533c86b6
Author: Robert Nagy <robert at openbsd.org>
Date: Mon Nov 15 15:56:06 2010 +0100
several openbsd changes to find libs and binaries
- Add /usr/local/{bin,sbin} as last to find genbrk,
genccode and gencmn.
- Add more directories to qt_libdir and qt_incdir
- Make sure find libqt-mt.so and libDCOP.so with
a library major and minor in the filename where
the .so does not exists, but foo.so.0.0 does.
diff --git a/configure.in b/configure.in
index ec349b6..7fe61eb 100644
--- a/configure.in
+++ b/configure.in
@@ -5087,15 +5087,15 @@ if test -n "$with_system_icu" -o -n "$with_system_libs" && \
AC_LANG_PUSH([C++])
AC_MSG_CHECKING([for unicode/rbbi.h])
AC_TRY_CPP(unicode/rbbi.h, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([icu headers not found.]))
- AC_PATH_PROG(SYSTEM_GENBRK, genbrk, [], [$PATH:/usr/sbin:/sbin])
+ AC_PATH_PROG(SYSTEM_GENBRK, genbrk, [], [$PATH:/usr/sbin:/sbin:/usr/local/bin])
if test -z "$SYSTEM_GENBRK"; then
AC_MSG_ERROR([\"genbrk\" not found in \$PATH, install the icu development tool \"genbrk"\])
fi
- AC_PATH_PROG(SYSTEM_GENCCODE, genccode, [], [$PATH:/usr/sbin:/sbin])
+ AC_PATH_PROG(SYSTEM_GENCCODE, genccode, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
if test -z "$SYSTEM_GENCCODE"; then
AC_MSG_ERROR([\"genccode\" not found in \$PATH, install the icu development tool \"genccode"\])
fi
- AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin])
+ AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin:/usr/local/sbin])
if test -z "$SYSTEM_GENCMN"; then
AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\])
fi
@@ -6637,15 +6637,17 @@ dnl ===================================================================
KDE_CFLAGS=""
KDE_LIBS=""
-MOC="moc"
+if test "$_os" != "OpenBSD"; then
+ MOC="moc"
+fi
if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
dnl Search paths for Qt3 and KDE3
if test "$build_cpu" != "x86_64" ; then
- qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include $x_includes"
- qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
+ qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include /usr/local/include/X11/qt3 $x_includes"
+ qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/lib/qt3 $x_libraries"
else
- qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include $x_includes"
- qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib $x_libraries"
+ qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include /usr/local/include/X11/qt3 $x_includes"
+ qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib /usr/local/lib/qt3 $x_libraries"
fi
if test -n "$QTDIR" ; then
qt_incdirs="$QTDIR/include $qt_incdirs"
@@ -6673,9 +6675,9 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
dnl What to test
qt_test_include="qstyle.h"
- qt_test_library="libqt-mt.so"
+ qt_test_library="libqt-mt.so*"
kde_test_include="kapp.h"
- kde_test_library="libDCOP.so"
+ kde_test_library="libDCOP.so*"
dnl Check for Qt3 headers
AC_MSG_CHECKING([for Qt3 headers])
@@ -6696,7 +6698,7 @@ your Qt3 installation by exporting QTDIR before running "configure".])
AC_MSG_CHECKING([for Qt3 libraries])
qt_libdir="no"
for qt_check in $qt_libdirs ; do
- if test -r "$qt_check/$qt_test_library" ; then
+ if test -r "`ls $qt_check/$qt_test_library 2>/dev/null | head -1`" ; then
qt_libdir="$qt_check"
break
fi
@@ -6733,7 +6735,7 @@ your KDE3 installation by exporting KDEDIR before running "configure".])
AC_MSG_CHECKING([for KDE3 libraries])
kde_libdir="no"
for kde_check in $kde_libdirs ; do
- if test -r "$kde_check/$kde_test_library" ; then
+ if test -r "`ls $kde_check/$kde_test_library 2>/dev/null | head -1`" ; then
kde_libdir="$kde_check"
break
fi
commit 9c29e8a56a7cd9ebb0fe862b1529b5ec93ceaa41
Merge: b7a2e72... f30dabc...
Author: Tor Lillqvist <tml at hemulen.(none)>
Date: Fri Nov 12 15:07:13 2010 +0200
Merge branch 'feature/pptx-export-ooxml11' into libreoffice-3-3
commit 65adbdfb2b6cf4f77d6232cdd4db427297ce5dad
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Nov 12 12:14:56 2010 +0100
OOO330
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index aed4bf7..e22bfc3 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m14(Build:9542)
-BUILD=9542
-LAST_MINOR=m14
+RSCREVISION=330m15(Build:9546)
+BUILD=9546
+LAST_MINOR=m15
SOURCEVERSION=OOO330
commit 3ba0f5f2afde91e5a7df5a38b762deca25263545
Merge: 066088e... 0a2c91e...
Author: obo <obo at openoffice.org>
Date: Fri Nov 12 08:17:48 2010 +0100
CWS-TOOLING: integrate CWS native346
commit 0a2c91e1fa90d5ac8eddbc6be331173fc01fb174
Author: Ingo Schmidt <is at openoffice.org>
Date: Wed Nov 10 17:22:41 2010 +0100
native346 #i115501# always install binfilter resource files
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index ca3c94b..4857ecf 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -60,7 +60,7 @@ Module gid_Module_Langpack_Binfilter_Template
ParentID = gid_Module_Optional_Binfilter;
Name = "gid_Module_Langpack_Binfilter_Template";
Description = "gid_Module_Langpack_Binfilter_Template";
- Default = NO;
+ Default = YES;
Styles = (TEMPLATEMODULE);
Files = (gid_File_Res_Bf_Sch,
gid_File_Res_Bf_Svx,
diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct
index 72c2092..ffcabf0 100644
--- a/scp2/source/templates/module_langpack_binfilter.sct
+++ b/scp2/source/templates/module_langpack_binfilter.sct
@@ -28,7 +28,7 @@
Module gid_Module_Langpack_Binfilter_<LANGUAGE_>
ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
Sortkey = "900";
- Default = NO;
+ Default = YES;
Language = "<LANGUAGE>";
Assigns = gid_Module_Langpack_Binfilter_Template;
Name = "gid_Module_Langpack_Binfilter_<LANGUAGE_>";
commit cd78195d3de8135be70f6f044adbb58283f8c3aa
Author: Ingo Schmidt <is at openoffice.org>
Date: Tue Nov 9 13:25:59 2010 +0100
native346 #i115376# making update process more flexible
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index 9bb051e..3968375 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -2,4 +2,6 @@ Property Signature_
s72 s72
AppSearch Property Signature_
INSTALLLOCATION installuser
+INSTALLLOCATION installuser_
INSTALLLOCATION installmachine
+INSTALLLOCATION installmachine_
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 2fb2d29..661b9a4 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -1,5 +1,7 @@
Signature_ Root Key Name Type
s72 i2 s255 S255 I2
RegLocator Signature_
-installuser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
-installmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installuser 1 Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installuser_ 1 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installmachine 2 Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
+installmachine_ 2 Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
index 41ff152..9a3dac5 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
@@ -2,4 +2,6 @@ Property Signature_
s72 s72
AppSearch Property Signature_
INSTALLLOCATION basisinstalluser
+INSTALLLOCATION basisinstalluser_
INSTALLLOCATION basisinstallmachine
+INSTALLLOCATION basisinstallmachine_
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
index 5121f78..072fdcf 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
@@ -1,5 +1,7 @@
Signature_ Root Key Name Type
s72 i2 s255 S255 I2
RegLocator Signature_
-basisinstalluser 1 Software\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstallmachine 2 Software\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstalluser 1 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstalluser_ 1 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstallmachine 2 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstallmachine_ 2 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
commit f30dabcd17a5abe61398c7ce08554e2ab4215041
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Nov 1 14:55:58 2010 +0200
From hg changeset 11bdb9c019c49df77306d1a9915b44e1f8dbf79e in ooxml11
ooxml11: intermediate commit
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d052261..002eef4 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -345,7 +345,7 @@ End
STD_FILTER_FILE( gid_File_Filter_Eme, eme)
-STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt)
+STD_UNO_LIB_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt)
STD_FILTER_FILE( gid_File_Filter_Icg, icg)
More information about the Libreoffice-commits
mailing list