[Libreoffice-commits] .: 36 commits - configure.in instsetoo_native/res instsetoo_native/util ooo.lst scp2/source set_soenv.in solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Feb 7 17:07:42 PST 2011
configure.in | 90 +++++--------
instsetoo_native/res/nologobanner.bmp |binary
instsetoo_native/res/nologoinstall.bmp |binary
instsetoo_native/util/makefile.mk | 12 +
instsetoo_native/util/openoffice.lst | 12 -
ooo.lst | 2
scp2/source/base/folderitem_base.scp | 1
scp2/source/calc/folderitem_calc.scp | 1
scp2/source/draw/folderitem_draw.scp | 1
scp2/source/extensions/directory_extensions.scp | 18 ++
scp2/source/extensions/file_extensions.scp | 6
scp2/source/extensions/module_extensions.scp | 1
scp2/source/extensions/module_extensions_lightproof.scp | 3
scp2/source/extensions/module_extensions_sun_templates.scp | 3
scp2/source/impress/folderitem_impress.scp | 1
scp2/source/math/folderitem_math.scp | 1
scp2/source/ooo/folderitem_ooo.scp | 2
scp2/source/ooo/module_helppack.ulf | 12 +
scp2/source/ooo/module_langpack.ulf | 14 +-
scp2/source/ooo/registryitem_ooo.scp | 1
scp2/source/quickstart/folderitem_quickstart.scp | 1
scp2/source/writer/folderitem_writer.scp | 1
set_soenv.in | 4
solenv/inc/minor.mk | 6
24 files changed, 119 insertions(+), 74 deletions(-)
New commits:
commit 10e5b6d92bca6f77ca54b9e251349b1fb26d72ea
Merge: 72424ae... d534fb2...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Feb 8 00:31:41 2011 +0100
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
configure.in
solenv/bin/build.pl
diff --cc configure.in
index 6fb42ca,c0b76f8..f210dd4
mode 100755,100644..100755
--- a/configure.in
+++ b/configure.in
@@@ -966,319 -906,325 +966,315 @@@ AC_ARG_WITH(stlport
Warning!!, disabling using --without-stlport or
enabling using --with-stlport on a platform that
- defaults to the opposite will break ABI compatability
-], WITH_STLPORT=$withval , WITH_STLPORT=auto)
+ defaults to the opposite will break ABI compatability.
+ ],
+ WITH_STLPORT=$withval ,
+WITH_STLPORT=auto)
AC_ARG_WITH(jdk-home,
-[ --with-jdk-home if you have installed JDK 1.3 or later on your system
- please supply the path here.
- Note that this is not the location of the Java binary
- but the location of the entire distribution.
-
- Usage: --with-jdk-home=<absolute path to JDK home>
-],,)
+ AS_HELP_STRING([--with-jdk-home],
+ [If you have installed JDK 1.3 or later on your system please supply the
+ path here. Note that this is not the location of the Java binary but the
+ location of the entire distribution.])
+ [
+ Usage: --with-jdk-home=<absolute path to JDK home>
+ ],
+,)
AC_ARG_WITH(gxx_include_path,
-[ --with-gxx-include-path if you want to override the autodetected g++ include
- path.
-
- Usage: --with-gxx-include-path=<absolute path to g++ include dir>
-],,)
+ AS_HELP_STRING([--with-gxx-include-path],
+ [If you want to override the autodetected g++ include path.])
+ [
+ Usage: --with-gxx-include-path=<absolute path to
+ g++ include dir>
+ ],
+,)
AC_ARG_WITH(java,
-[ --with-java Build with[[out]] Java support. If you use
- --without-java/--with-java=no then the build will have
- no support for Java components, applets, accessibility
- or XML filters.
-], if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi, WITH_JAVA=java)
+ AS_HELP_STRING([--with-java],
+ [Build with(out) Java support. If you use --without-java/--with-java=no
+ then the build will have no support for Java components, applets,
+ accessibility or XML filters.]),
+ if test "$withval" = "yes"; then
+ WITH_JAVA=java;
+ else
+ WITH_JAVA=$withval;
+ fi ,
+WITH_JAVA=java)
AC_ARG_WITH(java_target_version,
-[ --with-java-target-version Generate class files that will work on JVMs with
- the specified version. For example, use
- --with-java-target-version=1.4 to make sure that the
- application will work with JVM 1.4 even when compiled
- with JDK 1.5.
-
- This option is ignored when you compile with gcj/gij.
-
- Usage: --with-java-target-version=<jvm version>
-],,)
+ AS_HELP_STRING([--with-java-target-version],
+ [Generate class files that will work on JVMs with the specified version.
+ For example, use --with-java-target-version=1.4 to make sure that the
+ application will work with JVM 1.4 even when compiled with JDK 1.5.])
+ [
+ This option is ignored when you compile with gcj/gij.
+
+ Usage: --with-java-target-version=<jvm version>
+ ],
+,)
AC_ARG_WITH(ant-home,
-[ --with-ant-home If you have installed Jakarta Ant on your system,
- please supply the path here.
- Note that this is not the location of the Ant binary
- but the location of the entire distribution.
-
- Usage: --with-ant-home=<absolute path to Ant home>
-],,)
+ AS_HELP_STRING([--with-ant-home],
+ [If you have installed Jakarta Ant on your system, please supply the path here.
+ Note that this is not the location of the Ant binary but the location
+ of the entire distribution.])
+ [
+ Usage: --with-ant-home=<absolute path to Ant home>
+ ],
+,)
AC_ARG_WITH(junit,
-[ --with-junit Specifies the JUnit 4 jar file to use for JUnit-based
- tests. --without-junit disables those tests. Not
- relevant in the --without-java case.
-
- Usage: --with-junit=<absolute path to JUnit 4 jar>
-],,with_junit=yes)
+ AS_HELP_STRING([--with-junit],
+ [Specifies the JUnit 4 jar file to use for JUnit-based tests.
+ --without-junit disables those tests. Not relevant in the --without-java case.])
+ [
+ Usage: --with-junit=<absolute path to JUnit 4 jar>
+ ],
+,with_junit=yes)
AC_ARG_WITH(perl-home,
-[ --with-perl-home If you have installed the Perl 5 Distribution, on your
- system, please supply the path here.
- Note that this is not the location of the Perl binary
- but the location of the entire distribution.
-
- Usage: --with-perl-home=<absolute path to Perl 5 home>
-],,)
+ AS_HELP_STRING([--with-perl-home],
+ [If you have installed the Perl 5 Distribution, on your system, please
+ supply the path here. Note that this is not the location of the Perl
+ binary but the location of the entire distribution.])
+ [
+ Usage: --with-perl-home=<abs. path to Perl 5 home>
+ ],
+,)
AC_ARG_WITH(cl-home,
-[ --with-cl-home For Windows NT users, please supply the path
- for the Microsoft C/C++ compiler.
- Note that this is not the location of the compiler
- binary but the location of the entire distribution.
-
- Usage: --with-cl-home=<absolute path to Microsoft C/C++ compiler home>
-],,)
+ AS_HELP_STRING([--with-cl-home],
+ [For Windows NT users, please supply the path for the Microsoft C/C++
+ compiler. Note that this is not the location of the compiler binary but
+ the location of the entire distribution.])
+ [
+ Usage: --with-cl-home=<absolute path to Microsoft
+ C/C++ compiler home>
+ ],
+,)
AC_ARG_WITH(mspdb-path,
-[ --with-mspdb-path For Microsoft C/C++ compiler users, please supply the
- path pointing to the mspdb80.dll (if using Visual
- Studio 2008) or mspdb100.dl (if using Visual Studio
- 2010).
-
- Usage: --with-mspdb-path=<path to mspdb80.dll/mspdb100.dll>
-],,)
+ AS_HELP_STRING([--with-mspdb-path],
+ [For Microsoft C/C++ compiler users, please supply the path pointing to
+ the mspdb80.dll (if using Visual Studio 2008) or mspdb100.dl (if using
+ Visual Studio 2010).])
+ [
+ Usage: --with-mspdb-path=<path to
+ mspdb80.dll/mspdb100.dll>
+ ],
+,)
AC_ARG_WITH(midl-path,
-[ --with-midl-path For Microsoft compiler users, please supply
- the path pointing to the midl.exe.
-
- Usage: --with-midl-path=<absolute path to midl.exe>
-],,)
+ AS_HELP_STRING([--with-midl-path],
+ [For Microsoft compiler users, please supply the path pointing to the midl.exe.])
+ [
+ Usage: --with-midl-path=<abs. path to midl.exe>
+ ],
+,)
AC_ARG_WITH(csc-path,
-[ --with-csc-path For Windows builds, please supply
- the path pointing to the csc.exe.
- Usually found automatically
-
- Usage: --with-csc-path=<absolute path to csc.exe>
-],,)
+ AS_HELP_STRING([--with-csc-path],
+ [For Windows builds, please supply the path pointing to the csc.exe.
+ Usually found automatically.])
+ [
+ Usage: --with-csc-path=<abs. path to csc.exe>
+ ],
+,)
AC_ARG_WITH(nsis-path,
-[ --with-nsis-path For Windows users, please supply the path to the
- "Nullsoft Scriptable Install System" (NSIS). If NSIS
- is found in the path or this option is supplied a self
- contained executable installer for LibreOffice will
- be created.
-
- Usage: --with-nsis-path=<absolute path to nsis.exe>
-],,)
+ AS_HELP_STRING([--with-nsis-path],
+ [For Windows users, please supply the path to the "Nullsoft Scriptable
+ Install System" (NSIS). If NSIS is found in the path or this option is
+ supplied a self contained executable installer for LibreOffice will
+ be created.])
+ [
+ Usage: --with-nsis-path=<abs. path to nsis.exe>
+ ],
+,)
AC_ARG_WITH(frame-home,
-[ --with-frame-home For Microsoft compiler users, please supply
- the path pointing to lib/mscoree.lib, usually
- something like:
- "/cygdrive/c/Program Files/Windows SDKs/Windows/v7.0"
-
- Note that in most cases it will be automatically found,
- though.
-
- Usage: --with-frame-home=<absolute path to .NET Framework>]
-,,)
+ AS_HELP_STRING([--with-frame-home],
+ [For Microsoft compiler users, please supply the path pointing to
+ lib/mscoree.lib, usually something like:
+ "/cygdrive/c/Program Files/Windows SDKs/Windows/v7.0"])
+ [
+ Note that in most cases it will be automatically
+ found, though.
+
+ Usage: --with-frame-home=<absolute path to .NET
+ Framework>
+ ],
+,)
AC_ARG_WITH(psdk-home,
-[ --with-psdk-home For Windows users, please supply the path to the
- Windnows SDK. Usually found automatically.
-
- Usage: --with-psdk-home=<absolute path to Windows SDK>
-],,)
+ AS_HELP_STRING([--with-psdk-home],
+ [For Windows users, please supply the path to the Windnows SDK.
+ Usually found automatically.])
+ [
+ Usage: --with-psdk-home=<abs. path to Windows SDK>
+ ],
+,)
AC_ARG_WITH(directx-home,
-[ --with-directx-home For Windows users, please supply the path to the
- Microsoft DirectX SDK.
-
- Usage: --with-directx-home=<absolute path to Microsoft DirectX SDK>
-],,)
+ AS_HELP_STRING([--with-directx-home],
+ [For Windows users, please supply the path to the Microsoft DirectX SDK.])
+ [
+ Usage: --with-directx-home=<absolute path to
+ Microsoft DirectX SDK>
+ ],
+,)
AC_ARG_WITH(mozilla-build,
-[ --with-mozilla-build For Windows users, please supply the path to the
- mozilla build tools.
-
- Usage: --with-mozilla-build=<absolute path to mozilla build tools>
-
- At the moment of this writing, an installer for the mozilla build tools
- can be obtained from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
-],[MOZILLABUILD=$withval],)
+ AS_HELP_STRING([--with-mozilla-build],
+ [For Windows users, please supply the path to the mozilla build tools.])
+ [
+ Usage: --with-mozilla-build=<absolute path to
+ mozilla build tools>
+
+ At the moment of this writing, an installer for the
+ mozilla build tools can be obtained from http://ftp.
+ mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
+ ],
+ MOZILLABUILD=$withval ,
+)
AC_ARG_WITH(local-solenv,
-[ --with-local-solenv If you have solenv in a location other than ./solenv,
- please supply the path here.
-
- Usage: --with-local-solenv=<absolute path to solenv>
-],,)
+ AS_HELP_STRING([--with-local-solenv],
+ [If you have solenv in a location other than ./solenv, please supply the path here.])
+ [
+ Usage: --with-local-solenv=<abs. path to solenv>
+ ],
+,)
AC_ARG_WITH(local-solver,
-[ --with-local-solver if you have solver in a location other than ./solver,
- please supply the path here.
-
- Usage: --with-local-solver=<absolute path to solver>
-],,)
+ AS_HELP_STRING([--with-local-solver],
+ [If you have solver in a location other than ./solver, please supply the path here.])
+ [
+ Usage: --with-local-solver=<abs. path to solver>
+ ],
+,)
AC_ARG_WITH(lang,
-[ --with-lang Use this option to build LibreOffice with
- additional language support. English (US) is always
- included by default. Separate multiple languages with
- space. For all languages, use --with-lang=ALL.
-
- Usage: --with-lang="es sw tu cs sk"
-],,)
+ AS_HELP_STRING([--with-lang],
+ [Use this option to build LibreOffice with additional language support.
+ English (US) is always included by default.
+ Separate multiple languages with space.
+ For all languages, use --with-lang=ALL.])
+ [
+ Usage: --with-lang="es sw tu cs sk"
+ ],
+,)
AC_ARG_WITH(poor-help-localizations,
-[ --with-poor-help-localizations
- Use this option to specify which languages have
- unusable help localizations. Separate multiple
- languages with space.
-
- Usage: --with-poor-help-localizations="af ar be-BY ca"
-],,)
+ AS_HELP_STRING([--with-poor-help-localizations],
+ [Use this option to specify which languages have unusable help localizations.
+ Separate multiple languages with space.])
+ [
+ Usage: --with-poor-help-localizations="af be-BY"
+ ],
+,)
AC_ARG_WITH(dict,
-[ --with-dict Use this option to build LibreOffice with
- dictionary support. ALL dictionaries are always
- included by default unless overridden with
- this option. Separate multiple dictionaries with
- commas. For all dictionaries, use --with-dict=ALL.
-
- Usage: --with-dict=ENGB,ENUS,ITIT
-],,)
+ AS_HELP_STRING([--with-dict],
+ [Use this option to build LibreOffice with dictionary support.
+ ALL dictionaries are always included by default unless overridden with this option.
+ Separate multiple dictionaries with commas.
+ For all dictionaries, use --with-dict=ALL.])
+ [
+ Usage: --with-dict=ENGB,ENUS,ITIT
+ ],
+,)
- AC_ARG_WITH(intro-bitmaps,
- AS_HELP_STRING([--with-intro-bitmaps],
- [Prefer the specified intro bitmaps over the the default one.
- Can be more than one (separated by commas), the order means priority of
- fallback if the first does not exist (in the installed tree).])
- [
- Usage: --with-intro-bitmaps=/path/my_lo_intro.bmp
- ],
- ,)
+ AC_ARG_WITH(intro-bitmap,
+ [ --with-intro-bitmap Prefer the specified intro bitmap over the
+ the default one.
- AC_ARG_WITH(about-bitmaps,
- AS_HELP_STRING([--with-about-bitmaps],
- [Similarly to --with-intro-bitmaps, this allows specification of bitmaps for the About box.])
- [
- Usage: --with-about-bitmaps=/path/my_lo_about.bmp
- ],
- ,)
+ Usage: --with-intro-bitmap=/path/my_ooo_intro.png
+ ],,)
+
+ AC_ARG_WITH(about-bitmap,
+ [ --with-about-bitmap Similarly to --with-intro-bitmap, this allows
+ specification of bitmap for the About box.
+
+ Usage: --with-about-bitmap=/path/my_ooo_about.png
+ ],,)
AC_ARG_WITH(vendor,
-[ --with-vendor Set vendor of the build.
-
- Usage: --with-vendor="John the Builder"
-],,)
+ AS_HELP_STRING([--with-vendor],
+ [Set vendor of the build.])
+ [
+ Usage: --with-vendor="John the Builder"
+ ],
+,)
AC_ARG_WITH(unix-wrapper,
-[ --with-unix-wrapper Redefines the name of the UNIX wrapper that will be used
- in the desktop files and in the desktop-integration RPMs.
-
- Usage: --with-unix-wrapper=ooffice
-],,)
+ AS_HELP_STRING([--with-unix-wrapper],
+ [Redefines the name of the UNIX wrapper that will be used in the desktop
+ files and in the desktop-integration RPMs.])
+ [
+ Usage: --with-unix-wrapper=ooffice
+ ],
+,)
AC_ARG_WITH(asm-home,
-[ --with-asm-home For Windows users, please supply the path for the
- ml.exe assembler.
-
- Usage: --with-asm-home=<path to ml.exe directory>
-],,)
+ AS_HELP_STRING([--with-asm-home],
+ [For Windows, please supply the path for the ml.exe or ml64.exe assembler.])
+ [
+ Usage: --with-asm-home=<path to assembler directory>
+ ],
+,)
AC_ARG_WITH(os-version,
-[ --with-os-version For FreeBSD users, use this option option to override
- the detected OSVERSION.
-
- Usage: --with-os-version=<OSVERSION>
-],,)
+ AS_HELP_STRING([--with-os-version],
+ [For FreeBSD users, use this option option to override the detected OSVERSION.])
+ [
+ Usage: --with-os-version=<OSVERSION>
+ ],
+,)
AC_ARG_WITH(zip-home,
-[ --with-zip-home If you use a non standard zip, for example windows
- please supply the path for zip
-
- Usage: --with-zip-home=<path to zip executable>
-],,)
-
-AC_ARG_WITH(mingwin,
-[ --with-mingwin For Windows users, use the mingwin32 compiler within
- cygwin environment
+ AS_HELP_STRING([--with-zip-home],
+ [If you use a non standard zip, for example windows please supply the path for zip.])
+ [
+ Usage: --with-zip-home=<path to zip executable>
+ ],
+,)
- Usage: --with-mingwin=yes
+AC_ARG_WITH(mingw,
+ AS_HELP_STRING([--with-mingw],
+ [For Windows users, use the MinGW compiler within a Cygwin environment.])
+ [
+ Usage: --with-mingw=yes
- For !Windows use, use the mingw32 C++ compiler to
- (re-) build unowinreg.dll. Specify the MinGW C++
+ For non-Windows use, use the MinGW C++ compiler to
+ (re-)build unowinreg.dll. Specify the MinGW C++
Compilers name.
- Usage: --with-mingwin=i586-mingw32msvc-g++
-],WITH_MINGWIN=$withval,WITH_MINGWIN=0)
+ Usage: --with-mingw=i586-mingw32msvc-g++
+ ],
+ WITH_MINGW=$withval ,
+WITH_MINGW=0)
AC_ARG_WITH(build-version,
-[ --with-build-version Allows the builder to add a custom version tag
- that will appear in the Help/About box for QA
- purposes.
-
- Usage: --with-build-version="Built by Jim"
-],with_build_version=$withval)
+ AS_HELP_STRING([--with-build-version],
+ [Allows the builder to add a custom version tag that will appear in the
+ Help/About box for QA purposes.])
+ [
+ Usage: --with-build-version="Built by Jim"
+ ],
+ with_build_version=$withval ,
+)
AC_ARG_WITH(alloc,
-[ --with-alloc Define which allocator to build with
- (choices are oo, system, tcmalloc, jemalloc)
-
- Note that on FreeBSD/NetBSD system==jemalloc
-],,)
-
-AC_ARG_WITH(sun-templates,
-[
- --with-sun-templates Integrate Sun template packages.],
-,)
-
-AC_ARG_WITH(lightproof,
-[
- --with-lightproof Integrate Lightproof extension],
-,)
-
-AC_ARG_WITH(numbertext,
-[
- --with-numbertext Integrate Numbertext extension],
-,)
-
-AC_ARG_WITH(hunart,
-[
- --with-hunart Integrate Hungarian Cross-reference Toolbar extension],
-,)
-
-AC_ARG_WITH(typo,
-[
- --with-typo Integrate Typography Toolbar extension],
-,)
-
-AC_ARG_WITH(watch-window,
-[
- --with-watch-window Integrate Watch Window extension to Calc],
-,)
-
-AC_ARG_WITH(diagram,
-[
- --with-diagram Integrate Diagram extension],
-,)
-
-AC_ARG_WITH(validator,
-[
- --with-validator Integrate Validator extension],
-,)
-
-AC_ARG_WITH(barcode,
-[
- --with-barcode Integrate Barcode extension],
-,)
-
-AC_ARG_WITH(google-docs,
-[
- --with-google-docs Download and integrate Google Documents extension.],
-,)
-
-AC_ARG_WITH(nlpsolver,
-[
- --with-nlpsolver Download and integrate NLPSolver extension.],
+ AS_HELP_STRING([--with-alloc],
+ [Define which allocator to build with (choices are oo, system, tcmalloc, jemalloc).
+ Note that on FreeBSD/NetBSD system==jemalloc]),
,)
-AC_ARG_WITH(oooblogger,
-[
- --with-oooblogger Download and integrate oooblogger extension.],
+AC_ARG_WITH(sun-templates,
+ AS_HELP_STRING([--with-sun-templates],
+ [Integrate Sun template packages.]),
,)
AC_ARG_WITH(num-cpus,
diff --cc set_soenv.in
index 0afcc65,ea9f10c..6aefd56
mode 100755,100644..100755
--- a/set_soenv.in
+++ b/set_soenv.in
commit d534fb2ba429f8ddc368d1f4b6536e84a78f2a09
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 27 20:35:38 2011 +0000
get this hack working for gcc 4.6.0
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
index 279f047..ac863a4 100644
--- a/stlport/systemstlguards/preextstl.h
+++ b/stlport/systemstlguards/preextstl.h
@@ -48,7 +48,13 @@
# if defined(_GNUC__)
# pragma GCC visibility push(default)
# endif
-# include _STLP_NATIVE_HEADER(exception_defines.h)
+//Do we still need to include exception_defines.h here, I'd prefer
+//to drop it if possible
+# if (__GNUC__ >= 5 || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)))
+# include _STLP_NATIVE_HEADER(bits/exception_defines.h)
+# else
+# include _STLP_NATIVE_HEADER(exception_defines.h)
+# endif
# include _STLP_NATIVE_HEADER(limits)
# include _STLP_NATIVE_HEADER(memory)
# include _STLP_NATIVE_HEADER(exception)
commit 48a36b901ee93302efef0d9e6c1e5751431a57fd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Jan 25 00:43:59 2011 +0200
No ddraw.h or ddraw.lib in the June 2010 DirectX SDK
(cherry picked from commit 43e3b9af8f5d85f06485e74b1080cc6a6a86eac4)
Signed-off-by: Fridrich Strba <fridrich.strba at bluewin.ch>
diff --git a/configure.in b/configure.in
index d9ae234..c0b76f8 100644
--- a/configure.in
+++ b/configure.in
@@ -5809,7 +5809,7 @@ if test \( "$_os" = "WINNT" \) ; then
# Remove a possible trailing backslash
DIRECTXSDK_HOME=`echo $DIRECTXSDK_HOME | $SED 's/\/$//'`
- if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" ; then
+ if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" -o -f "$DIRECTXSDK_HOME/Include/d3d9.h" ; then
HAVE_DIRECTXSDK_H="yes"
else
HAVE_DIRECTXSDK_H="no"
@@ -5820,7 +5820,7 @@ if test \( "$_os" = "WINNT" \) ; then
else
DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib"
fi
- if test -f "$DIRECTXSDK_LIB/ddraw.lib" ; then
+ if test -f "$DIRECTXSDK_LIB/ddraw.lib" -o -f "$DIRECTXSDK_LIB/d3d9.lib" ; then
HAVE_DIRECTXSDK_LIB="yes"
else
HAVE_DIRECTXSDK_LIB="no"
commit 5179850420e8212ea91e19b1bb557741a372e35f
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jan 18 15:49:33 2011 +0100
bump SHORT_PRODUCTEXTENSION to rc4 and widnows build version to 6
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index ebe63ce..2ab17bf 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -57,7 +57,7 @@ LibreOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc4
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -126,7 +126,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc4
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -191,7 +191,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc4
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
@@ -269,7 +269,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc4
LICENSENAME LGPL
SERVICESPROJEKT 1
SETSTATICPATH 1
@@ -310,7 +310,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc4
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
@@ -355,7 +355,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc4
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 330ce12..3e2745f 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m19(Build:5)
-BUILD=5
+RSCREVISION=330m19(Build:6)
+BUILD=6
LAST_MINOR=m19
SOURCEVERSION=OOO330
commit 0db13a47d898e66b9c2f85baa4a04744d4287080
Author: Andras Timar <timar at fsf.hu>
Date: Tue Feb 1 19:17:24 2011 +0100
padded nologobanner.bmp, new size is 102x58 - fdo#33372
signed off by tml_ on irc
diff --git a/instsetoo_native/res/nologobanner.bmp b/instsetoo_native/res/nologobanner.bmp
index 726be75..3bd0887 100644
Binary files a/instsetoo_native/res/nologobanner.bmp and b/instsetoo_native/res/nologobanner.bmp differ
commit 990d04d2e17bdefd724674d4a1d5b22d00c543a0
Author: Andras Timar <timar at fsf.hu>
Date: Sat Jan 29 13:05:48 2011 +0100
added Occitan dict pack to scp2
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a703d94..0abcfc6 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -321,6 +321,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_No
DosName = "dict-no";
End
+Directory gid_Brand_Dir_Share_Extensions_Dict_Oc
+ ParentID = gid_Brand_Dir_Share_Extensions;
+ DosName = "dict-oc";
+End
+
Directory gid_Brand_Dir_Share_Extensions_Dict_Pl
ParentID = gid_Brand_Dir_Share_Extensions;
DosName = "dict-pl";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index af562ca..d33d2ff 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -2093,6 +2093,15 @@ End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Oc
+ Dir = gid_Brand_Dir_Share_Extensions_Dict_Oc;
+ Name = "dict-oc.oxt";
+ Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+ UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Pl
Dir = gid_Brand_Dir_Share_Extensions_Dict_Pl;
Name = "dict-pl.oxt";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 9775470..9118cd3 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -287,6 +287,17 @@ Module gid_Module_Root_Extension_Dictionary_No
Styles = ();
End
+Module gid_Module_Root_Extension_Dictionary_Oc
+ MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_OC );
+ Files = (gid_File_Extension_Dictionary_Oc);
+ InstallOrder = "2000";
+ Sortkey = "655";
+ Spellcheckerlanguage = "oc";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Dictionaries;
+ Styles = ();
+End
+
Module gid_Module_Root_Extension_Dictionary_Pl
MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PL );
Files = (gid_File_Extension_Dictionary_Pl);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 8c32e10..339d849 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -175,6 +175,12 @@ en-US = "Norwegian"
[STR_DESC_MODULE_EXTENSION_DICTIONARY_NO]
en-US = "Norwegian dictionaries (Nynorsk and Bokmal)"
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_OC]
+en-US = "Occitan"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_OC]
+en-US = "Occitan spell check dictionary"
+
[STR_NAME_MODULE_EXTENSION_DICTIONARY_PL]
en-US = "Polish"
commit e0fbe060b74ac134131baeb6c529836dd3031e04
Author: Andras Timar <timar at fsf.hu>
Date: Sat Jan 29 13:17:01 2011 +0100
updated description of Russian dict pack in scp2
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index b90df88..8c32e10 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -197,7 +197,7 @@ en-US = "Romanian Dictionaries"
en-US = "Russian"
[STR_DESC_MODULE_EXTENSION_DICTIONARY_RU]
-en-US = "Russian hyphenation dictionary and thesaurus"
+en-US = "Russian spell check dictionary, hyphenation rules and thesaurus"
[STR_NAME_MODULE_EXTENSION_DICTIONARY_SK]
en-US = "Slovak"
commit ed1439ee95f2b65d0a55bdc76f86230d3bea7efa
Author: Andras Timar <timar at fsf.hu>
Date: Sat Jan 22 16:51:25 2011 +0100
removed gd, ky, pap, and ti from postset.mk
gd - Gaelic (Scottish)
ky - Kirghiz
pap - Papiamento
ti - Tigrinya
UI localization does not exist in these languages. So it makes no
sense to build anything in these languages.
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 5afbeb9..2c58d3a 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -61,7 +61,6 @@ fa \
fi \
fr \
ga \
-gd \
gl \
gu \
he \
@@ -72,7 +71,6 @@ id \
is \
it \
ja \
-ky \
ka \
kk \
km \
@@ -100,7 +98,6 @@ ns \
om \
oc \
or \
-pap \
pa-IN \
pl \
pt \
@@ -122,7 +119,6 @@ st \
sv \
sw-TZ \
te \
-ti \
ta \
th \
tn \
commit 14e52673fe64862b64bfdf37e8b5a31d0b1b1e3c
Author: Andras Timar <timar at fsf.hu>
Date: Sat Jan 22 14:29:43 2011 +0100
removed ms, ps, and ur from postset.mk - fdo#33103
ms - Malay
ps - Pashto
ur - Urdu
UI localization does not exist in these languages. So it makes no
sense to build anything in these languages. This patch also fixes
fdo#33103 - 'Unknown' languages in Language drop down box in Tools
- Options - Language settings - Languages.
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index cfb0429..5afbeb9 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -88,7 +88,6 @@ mai \
mk \
mn \
mni \
-ms \
ml \
mr \
my \
@@ -104,7 +103,6 @@ or \
pap \
pa-IN \
pl \
-ps \
pt \
pt-BR \
ro \
@@ -132,7 +130,6 @@ tr \
ts \
tg \
ug \
-ur \
uk \
uz \
ve \
commit 0fc3da6228bc860245b36a85c1c5b9064808e045
Author: Andras Timar <timar at fsf.hu>
Date: Sat Jan 29 13:15:53 2011 +0100
added Ukrainian dict pack to scp2
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index e4cf708..a703d94 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -371,6 +371,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Th
DosName = "dict-th";
End
+Directory gid_Brand_Dir_Share_Extensions_Dict_Uk
+ ParentID = gid_Brand_Dir_Share_Extensions;
+ DosName = "dict-uk";
+End
+
Directory gid_Brand_Dir_Share_Extensions_Dict_Vi
ParentID = gid_Brand_Dir_Share_Extensions;
DosName = "dict-vi";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b8624ac..af562ca 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -2183,6 +2183,15 @@ End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Uk
+ Dir = gid_Brand_Dir_Share_Extensions_Dict_Uk;
+ Name = "dict-uk.oxt";
+ Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+ UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Vi
Dir = gid_Brand_Dir_Share_Extensions_Dict_Vi;
Name = "dict-vi.oxt";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 3eb22d6..9775470 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -397,6 +397,17 @@ Module gid_Module_Root_Extension_Dictionary_Th
Styles = ();
End
+Module gid_Module_Root_Extension_Dictionary_Uk
+ MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_UK );
+ Files = (gid_File_Extension_Dictionary_Uk);
+ InstallOrder = "2000";
+ Sortkey = "755";
+ Spellcheckerlanguage = "uk";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Dictionaries;
+ Styles = ();
+End
+
Module gid_Module_Root_Extension_Dictionary_Vi
MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_VI );
Files = (gid_File_Extension_Dictionary_Vi);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 058ff9a..b90df88 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -235,6 +235,12 @@ en-US = "Thai"
[STR_DESC_MODULE_EXTENSION_DICTIONARY_TH]
en-US = "Thai spelling dictionary"
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_UK]
+en-US = "Ukrainian spell check dictionary, hyphenation rules and thesaurus"
+
[STR_NAME_MODULE_EXTENSION_DICTIONARY_VI]
en-US = "Vietnamese"
commit 3bbb389243fbca174ffb1ba13a7ab83bd274fb57
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jan 29 12:51:38 2011 +0000
Resolves: fdo#31271 wrong line break with (
(cherry picked from commit de475b03b02e4cac162b517f7d9f302b6134d546)
diff --git a/configure.in b/configure.in
index db20f9d..d9ae234 100644
--- a/configure.in
+++ b/configure.in
@@ -5213,18 +5213,21 @@ if test -n "$with_system_icu" -o -n "$with_system_libs" && \
if test -z "$SYSTEM_GENCMN"; then
AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\])
fi
+
+ AC_PATH_PROG( ICUCONFIG, icu-config)
AC_MSG_CHECKING([ICU version])
- AC_TRY_RUN([
-#include <unicode/uversion.h>
+ ICU_VERSION=`$ICUCONFIG --version`
+ ICU_MAJOR=`$ICUCONFIG --version | cut -d"." -f1`
+ ICU_MINOR=`$ICUCONFIG --version | cut -d"." -f2`
+ ICU_MICRO=`$ICUCONFIG --version | cut -d"." -f3`
-int main(int argc, char **argv) {
- if(U_ICU_VERSION_MAJOR_NUM < 4)
- return 1;
- else
- return 0;
-}
- ], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])])
- AC_LANG_POP([C++])
+ if test "$ICU_MAJOR" -ge "4"; then
+ AC_MSG_RESULT([OK])
+ else
+ AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])
+ fi
+
+ AC_LANG_POP([C++])
else
AC_MSG_RESULT([internal])
SYSTEM_ICU=NO
@@ -5234,6 +5237,9 @@ AC_SUBST(SYSTEM_ICU)
AC_SUBST(SYSTEM_GENBRK)
AC_SUBST(SYSTEM_GENCCODE)
AC_SUBST(SYSTEM_GENCMN)
+AC_SUBST(ICU_MAJOR)
+AC_SUBST(ICU_MINOR)
+AC_SUBST(ICU_MICRO)
dnl ===================================================================
dnl Graphite
diff --git a/set_soenv.in b/set_soenv.in
index aa12caf..ea9f10c 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1923,6 +1923,9 @@ if ($SYSTEM_PYTHON eq "NO") {
ToFile( "HOME", "@HOME@", "e" );
}
ToFile( "SYSTEM_ICU", "@SYSTEM_ICU@", "e" );
+ToFile( "ICU_MAJOR", "@ICU_MAJOR@", "e" );
+ToFile( "ICU_MINOR", "@ICU_MINOR@", "e" );
+ToFile( "ICU_MICRO", "@ICU_MICRO@", "e" );
ToFile( "SYSTEM_GENBRK", "@SYSTEM_GENBRK@", "e" );
ToFile( "SYSTEM_GENCCODE", "@SYSTEM_GENCCODE@", "e" );
ToFile( "SYSTEM_GENCMN", "@SYSTEM_GENCMN@", "e" );
commit 2eee81c2c27eadc01f2a168d46571d7e9093a29b
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Sat Nov 6 00:30:03 2010 +0100
Pass thru PYTHON, found by configure.
Will be used by filter/source/config/fragments/makefile.mk.
diff --git a/set_soenv.in b/set_soenv.in
index 1c1e97b..aa12caf 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -90,7 +90,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
$PROEXT, $TARFILE_LOCATION,
- $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
+ $PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
#
#-------------------------------------------
# IId. Declaring the aliases.
@@ -128,6 +128,9 @@ $warnfile = "warn"; # logfile configure warnings.
$Warning = ""; # container for warning messages
$STLPORT4 = '@STLPORT4@'; # Location of STLport4
$SYSTEM_PYTHON = '@SYSTEM_PYTHON@';
+if ($SYSTEM_PYTHON eq "NO") {
+ $PYTHON = "python";
+}
$SYSTEM_MOZILLA = '@SYSTEM_MOZILLA@';
$JDK = '@JDK@';
$JAVAFLAGS = '@JAVAFLAGS@';
@@ -1913,6 +1916,7 @@ ToFile( "SYSTEM_OPENSSL", "@SYSTEM_OPENSSL@", "e" );
ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" );
ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" );
ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" );
+ToFile( "PYTHON", "@PYTHON@", "e" );
ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" );
ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" );
if ($SYSTEM_PYTHON eq "NO") {
commit d3a4702de8428109a906bad9776be4cfb4bf38b2
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sun Jan 23 22:49:27 2011 +0100
upgrade libwpd to 0.9.1
Signed-off-by: Jan Holesovsky <kendy at suse.cz>
diff --git a/ooo.lst b/ooo.lst
index 4ccdb6c..f339c05 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -78,7 +78,7 @@ e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz
0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2
-86e390f015e505dd71a66f0123c62f09-libwpd-0.9.0.tar.bz2
+5ff846847dab351604ad859e2fd4ed3c-libwpd-0.9.1.tar.bz2
9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2
http://download.go-oo.org/extern
185d60944ea767075d27247c3162b3bc-unowinreg.dll
commit 92120a767d8333225ce4211724d48d07792ca5a3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 22 16:04:05 2010 +0000
Move this system-mesa-headers test inside opengl extension test
Here it only gets used for non-Windows and non-Linux. It will current defaults
to using these "internal" headers like we do for xrender and friends.
diff --git a/configure.in b/configure.in
index 32c4601..db20f9d 100644
--- a/configure.in
+++ b/configure.in
@@ -5451,26 +5451,6 @@ AC_SUBST(XRANDR_LIBS)
AC_SUBST(ENABLE_RANDR)
dnl ===================================================================
-dnl Check for system Mesa
-dnl ===================================================================
-AC_MSG_CHECKING([which Mesa headers to use])
-if test "$with_system_mesa_headers" = "no"; then
- AC_MSG_RESULT([internal])
- SYSTEM_MESA_HEADERS=NO
- BUILD_TYPE="$BUILD_TYPE MESA"
-else
- AC_MSG_RESULT([external])
- SYSTEM_MESA_HEADERS=YES
- AC_LANG_PUSH(C)
- AC_CHECK_HEADER(GL/glxext.h, [],
- [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
- AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
- AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
- AC_LANG_POP(C)
-fi
-AC_SUBST(SYSTEM_MESA_HEADERS)
-
-dnl ===================================================================
dnl Check for building neon
dnl ===================================================================
AC_MSG_CHECKING([whether to use neon])
@@ -6338,22 +6318,45 @@ dnl ===================================================================
AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
ENABLE_OPENGL=
-if test "x$enable_opengl" != "xno" ; then
- save_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -lm"
- AC_MSG_RESULT([yes])
- AC_CHECK_HEADER(GL/gl.h, [],
- [AC_MSG_ERROR([OpenGL headers not found])], [])
- AC_CHECK_LIB(GL, main, [],
- [AC_MSG_ERROR(libGL not installed or functional)], [])
- AC_CHECK_LIB(GLU, main, [],
- [AC_MSG_ERROR(libGLU not installed or functional)], [])
- ENABLE_OPENGL=TRUE
- LDFLAGS=$save_LDFLAGS
+ if test "x$enable_opengl" != "xno" ; then
+ if test "$_os" != "WINNT"; then
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -lm"
+ AC_MSG_RESULT([yes])
+ AC_CHECK_LIB(GL, main, [],
+ [AC_MSG_ERROR(libGL not installed or functional)], [])
+ AC_CHECK_LIB(GLU, main, [],
+ [AC_MSG_ERROR(libGLU not installed or functional)], [])
+ ENABLE_OPENGL=TRUE
+ LDFLAGS=$save_LDFLAGS
+
+ dnl ===================================================================
+ dnl Check for system Mesa
+ dnl ===================================================================
+ AC_MSG_CHECKING([which Mesa headers to use])
+ if test -n "$with_system_mesa_headers" -o -n "$with_system_headers" && \
+ test "$with_system_mesa_headers" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_MESA_HEADERS=YES
+ AC_LANG_PUSH(C)
+ AC_CHECK_HEADER(GL/glxext.h, [],
+ [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
+ AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
+ AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
+ AC_LANG_POP(C)
+ else
+ AC_MSG_RESULT([internal])
+ SYSTEM_MESA_HEADERS=NO
+ BUILD_TYPE="$BUILD_TYPE MESA"
+ fi
+ else
+ AC_MSG_RESULT([not on windows])
+ fi
else
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
fi
+AC_SUBST(SYSTEM_MESA_HEADERS)
AC_SUBST(ENABLE_OPENGL)
AC_MSG_CHECKING([whether to build extra presenter ui])
commit 9fe021960f658c6421b9c660286674892332ab9e
Author: Michael Meeks <michael.meeks at novell.com>
Date: Wed Jan 12 14:22:21 2011 +0000
BrOffice Windows start menu branding
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index dae71a6..b418f7e 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2051,7 +2051,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17c.log", $filesinproductlanguageresolvedarrayref); }
if ( $installer::globals::updatedatabase ) { installer::windows::file::check_file_sequences($allupdatefileorder, $allupdatecomponentorder); }
- installer::windows::directory::create_directory_table($directoriesforepmarrayref, $newidtdir, $allvariableshashref, $shortdirname, $loggingdir);
+ # Attention: The table "Director.idt" contains language specific strings -> parameter: $languagesarrayref !
+ installer::windows::directory::create_directory_table($directoriesforepmarrayref, $languagesarrayref, $newidtdir, $allvariableshashref, $shortdirname, $loggingdir);
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles18.log", $filesinproductlanguageresolvedarrayref); }
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt1.log", $directoriesforepmarrayref); }
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index 7a5b79a..ff6b0c3 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -309,7 +309,7 @@ sub create_directorytable_from_collection
sub add_root_directories
{
- my ($directorytableref, $allvariableshashref) = @_;
+ my ($directorytableref, $allvariableshashref, $onelanguage) = @_;
# my $sourcediraddon = "";
# if (($installer::globals::addchildprojects) ||
@@ -324,7 +324,12 @@ sub add_root_directories
if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
{
- my $productname = $allvariableshashref->{'PRODUCTNAME'};
+ my $productname;
+
+ $productname = $allvariableshashref->{'PRODUCTNAME'};
+ if ($onelanguage eq 'pt-BR' && defined $allvariableshashref->{'PRODUCTNAME_BR'}) {
+ $productname = $allvariableshashref->{'PRODUCTNAME_BR'};
+ }
my $productversion = $allvariableshashref->{'PRODUCTVERSION'};
my $baseproductversion = $productversion;
@@ -427,7 +432,7 @@ sub add_root_directories
sub create_directory_table
{
- my ($directoryref, $basedir, $allvariableshashref, $shortdirnamehashref, $loggingdir) = @_;
+ my ($directoryref, $languagesarrayref, $basedir, $allvariableshashref, $shortdirnamehashref, $loggingdir) = @_;
# Structure of the directory table:
# Directory Directory_Parent DefaultDir
@@ -437,6 +442,11 @@ sub create_directory_table
# Before ":" : [sourcedir]:[destdir] (not programmed yet)
# After ":" : 8+3 and not 8+3 the destination directory name
+ for ( my $m = 0; $m <= $#{$languagesarrayref}; $m++ )
+ {
+ my $onelanguage = ${$languagesarrayref}[$m];
+ $installer::globals::installlocationdirectoryset = 0;
+
my @directorytable = ();
my $infoline;
@@ -448,16 +458,16 @@ sub create_directory_table
set_installlocation_directory($directoryref, $allvariableshashref);
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_3.log", $directoryref); }
installer::windows::idtglobal::write_idt_header(\@directorytable, "directory");
- add_root_directories(\@directorytable, $allvariableshashref);
+ add_root_directories(\@directorytable, $allvariableshashref, $onelanguage);
create_directorytable_from_collection(\@directorytable, $directoryref);
# Saving the file
- my $directorytablename = $basedir . $installer::globals::separator . "Director.idt";
+ my $directorytablename = $basedir . $installer::globals::separator . "Director.idt" . "." . $onelanguage;
installer::files::save_file($directorytablename ,\@directorytable);
$infoline = "Created idt file: $directorytablename\n";
push(@installer::globals::logfileinfo, $infoline);
-
+ }
}
1;
commit 9ec0ef6d5b13bf37c2594cea0350b669eff60066
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jan 11 23:05:56 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit 8c0a410c55f1fd8caf6b73eb5acca4260662bfe5
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jan 11 22:39:06 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit e70a2445c48c68d7c9bb0531ee92425d6599aa6f
Author: Andras Timar <timar at fsf.hu>
Date: Tue Jan 11 10:20:12 2011 +0100
removed language code 'kid'
kid is not Koshin but key id pseudo language which is good for
debugging UI but should no be included in the product
Signed off by Fridrich on irc.
diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf
index 648335d..64604c3 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -757,12 +757,6 @@ en-US = "Scottish Gaelic"
[STR_DESC_MODULE_HELPPACK_GD]
en-US = "Installs Scottish Gaelic help in %PRODUCTNAME %PRODUCTVERSION"
-[STR_NAME_MODULE_HELPPACK_KID]
-en-US = "Koshin"
-
-[STR_DESC_MODULE_HELPPACK_KID]
-en-US = "Installs Koshin help in %PRODUCTNAME %PRODUCTVERSION"
-
[STR_NAME_MODULE_HELPPACK_KK]
en-US = "Kazakh"
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index f469a3b..f2771c2 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -757,12 +757,6 @@ en-US = "Scottish Gaelic"
[STR_DESC_MODULE_LANGPACK_GD]
en-US = "Installs Scottish Gaelic support in %PRODUCTNAME %PRODUCTVERSION"
-[STR_NAME_MODULE_LANGPACK_KID]
-en-US = "Koshin"
-
-[STR_DESC_MODULE_LANGPACK_KID]
-en-US = "Installs Koshin support in %PRODUCTNAME %PRODUCTVERSION"
-
[STR_NAME_MODULE_LANGPACK_KK]
en-US = "Kazakh"
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 80c1f74..cfb0429 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -72,7 +72,6 @@ id \
is \
it \
ja \
-kid \
ky \
ka \
kk \
commit 21d95e97238323e33ae0475bde4a049adc6273a4
Author: Andras Timar <timar at fsf.hu>
Date: Tue Jan 11 10:16:33 2011 +0100
Added ca_XV and ast name and description
signedd off by Fridrich on irc
diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf
index 5183643..648335d 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -343,6 +343,12 @@ en-US = "Catalan"
[STR_DESC_MODULE_HELPPACK_CA]
en-US = "Installs Catalan help in %PRODUCTNAME %PRODUCTVERSION"
+[STR_NAME_MODULE_HELPPACK_CA_XV]
+en-US = "Catalan (Valencian)"
+
+[STR_DESC_MODULE_HELPPACK_CA_XV]
+en-US = "Installs Catalan (Valencian) help in %PRODUCTNAME %PRODUCTVERSION"
+
[STR_NAME_MODULE_HELPPACK_DA]
en-US = "Danish"
@@ -517,6 +523,12 @@ en-US = "Assamese"
[STR_DESC_MODULE_HELPPACK_AS_IN]
en-US = "Installs Assamese help in %PRODUCTNAME %PRODUCTVERSION"
+[STR_NAME_MODULE_HELPPACK_AST]
+en-US = "Asturian"
+
+[STR_DESC_MODULE_HELPPACK_AST]
+en-US = "Installs Asturian help in %PRODUCTNAME %PRODUCTVERSION"
+
[STR_NAME_MODULE_HELPPACK_RW]
en-US = "Kinyarwanda"
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 3b5949d..f469a3b 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -343,6 +343,12 @@ en-US = "Catalan"
[STR_DESC_MODULE_LANGPACK_CA]
en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_NAME_MODULE_LANGPACK_CA_XV]
+en-US = "Catalan (Valencian)"
+
+[STR_DESC_MODULE_LANGPACK_CA_XV]
+en-US = "Installs Catalan (Valencian) support in %PRODUCTNAME %PRODUCTVERSION"
+
[STR_NAME_MODULE_LANGPACK_DA]
en-US = "Danish"
@@ -517,6 +523,12 @@ en-US = "Assamese"
[STR_DESC_MODULE_LANGPACK_AS_IN]
en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_NAME_MODULE_LANGPACK_AST]
+en-US = "Asturian"
+
+[STR_DESC_MODULE_LANGPACK_AST]
+en-US = "Installs Asturian support in %PRODUCTNAME %PRODUCTVERSION"
+
[STR_NAME_MODULE_LANGPACK_RW]
en-US = "Kinyarwanda"
commit 7896b1d75e18540d5f5fa4fe255228be8f3f6d61
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Jan 10 19:47:07 2011 +0100
Version 3.3.0.3, tag libreoffice-3.3.0.3 (3.3-rc3)
commit 455bbb2b8ad1bb64148612ebce8d91ac28414e15
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Jan 10 17:14:52 2011 +0100
bump SHORT_PRODUCTEXTENSION to rc3 and widnows build version to 5
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index dccd310..ebe63ce 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -57,7 +57,7 @@ LibreOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -126,7 +126,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -191,7 +191,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
@@ -269,7 +269,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
LICENSENAME LGPL
SERVICESPROJEKT 1
SETSTATICPATH 1
@@ -310,7 +310,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
@@ -355,7 +355,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc2
+ SHORT_PRODUCTEXTENSION rc3
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index a830ab9..330ce12 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m19(Build:4)
-BUILD=4
+RSCREVISION=330m19(Build:5)
+BUILD=5
LAST_MINOR=m19
SOURCEVERSION=OOO330
commit 50319c1ed7e7ceb19d9be60a6aef6a441eb2e918
Author: Christoph Noack <christoph at dogmatux.com>
Date: Mon Jan 10 11:30:01 2011 +0000
add de-branded MSI installation artwork, bug#32435
diff --git a/instsetoo_native/res/nologobanner.bmp b/instsetoo_native/res/nologobanner.bmp
new file mode 100644
index 0000000..726be75
Binary files /dev/null and b/instsetoo_native/res/nologobanner.bmp differ
diff --git a/instsetoo_native/res/nologoinstall.bmp b/instsetoo_native/res/nologoinstall.bmp
index 25b5b11..8af9fc4 100644
Binary files a/instsetoo_native/res/nologoinstall.bmp and b/instsetoo_native/res/nologoinstall.bmp differ
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 31630d5..2befb3e 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -191,7 +191,7 @@ $(foreach,i,$(alllangiso) ooodevhelppack_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
-
+
$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) broffice_$i) : $(ADDDEPS)
@@ -341,11 +341,21 @@ hack_msitemplates .PHONY:
$(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+ $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
+ $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+ $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+ $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
+ $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+ $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
+ $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+ $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
+ $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
+ $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
.IF "$(OS)" == "WNT"
commit cceeee5fc714d45741492513ad31bb16dae190f8
Author: Andras Timar <timar at fsf.hu>
Date: Mon Jan 10 10:59:59 2011 +0100
Added ast, ca-XV, and id, removed sc (postset.mk)
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 74c92f0..80c1f74 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -33,6 +33,7 @@ defaultlangiso=en-US
completelangiso=af \
ar \
as \
+ast \
be-BY \
bo \
bg \
@@ -41,6 +42,7 @@ brx \
bn \
bs \
ca \
+ca-XV \
cs \
cy \
da \
@@ -66,6 +68,7 @@ he \
hi \
hr \
hu \
+id \
is \
it \
ja \
@@ -111,7 +114,6 @@ rw \
sat \
sa-IN \
si \
-sc \
sd \
sq \
sk \
commit 4173e7bf59cc7e1eed957ec91b5f96485235c0a5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 9 16:52:25 2011 +0000
set a template for mktemp, apparently required in macosx
diff --git a/solenv/bin/striplanguagetags.sh b/solenv/bin/striplanguagetags.sh
index 95aa3a7..46d88e0 100755
--- a/solenv/bin/striplanguagetags.sh
+++ b/solenv/bin/striplanguagetags.sh
@@ -6,7 +6,17 @@
#All a bit hacky, but it should work
-XSL=`mktemp`
+tempfoo=`basename $0`
+XSL=`mktemp /tmp/${tempfoo}.XXXXXX`
+if [ $? -ne 0 ]; then
+ echo "$0: Can't create temp file, exiting..."
+ exit 1
+fi
+WRKDIR=`mktemp -d /tmp/${tempfoo}.XXXXXX`
+if [ $? -ne 0 ]; then
+ echo "$0: Can't create temp dir, exiting..."
+ exit 1
+fi
cat > $XSL << EOF
<?xml version="1.0" encoding="UTF-8"?>
@@ -24,7 +34,6 @@ cat > $XSL << EOF
</xsl:stylesheet>
EOF
-WRKDIR=`mktemp -d`
unzip -q $1 -d $WRKDIR
pushd $WRKDIR
for a in *; do
commit 87d8fb2dccd47d3a3be072b4ccd36c9c2acf96e7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 7 20:43:27 2011 +0000
Resolves: fdo#32897 strip out template language tags
diff --git a/solenv/bin/striplanguagetags.sh b/solenv/bin/striplanguagetags.sh
new file mode 100755
index 0000000..95aa3a7
--- /dev/null
+++ b/solenv/bin/striplanguagetags.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+#take a .zip containing a flat hierarchy of odf files and strip out the
+#language and country tags in each of them and repack it all up
+#should convert templates so that documents based on them use
+#the default-document-language rather than the hardcoded lang-tag
+
+#All a bit hacky, but it should work
+
+XSL=`mktemp`
+
+cat > $XSL << EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
+
+<xsl:template match="node()|@*">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="@fo:language"/>
+<xsl:template match="@fo:country"/>
+
+</xsl:stylesheet>
+EOF
+
+WRKDIR=`mktemp -d`
+unzip -q $1 -d $WRKDIR
+pushd $WRKDIR
+for a in *; do
+ unzip -qc $a styles.xml > styles.tmp
+ eval "$CALLXSLTPROC -o styles.xml $XSL styles.tmp"
+ zip -qr $a styles.xml
+ rm styles.xml styles.tmp
+done
+popd
+zip -qrj $1 $WRKDIR
+rm -rf $WRKDIR
+rm -f $XSL
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index 608819d..8d74896 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -14,6 +14,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.IF "$(ZIP1TARGET)"!=""
+.IF "$(ZIP1STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
ZIP1EXT*=.zip
.IF "$(common_build_zip)"!=""
.IF "$(ZIP1LIST:s/LANGDIR//)" == "$(ZIP1LIST)"
@@ -117,6 +122,11 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
$(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
$(FI)
+.IF "$(ZIP1STRIPLANGUAGETAGS)" != ""
+ $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+ $(SOLARENV)/bin/striplanguagetags.sh $@ \
+ $(FI)
+.ENDIF
.ENDIF # "$(ZIP1DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
.ENDIF
@@ -137,6 +147,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.IF "$(ZIP2TARGET)"!=""
+.IF "$(ZIP2STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
ZIP2EXT*=.zip
.IF "$(common_build_zip)"!=""
.IF "$(ZIP2LIST:s/LANGDIR//)" == "$(ZIP2LIST)"
@@ -240,6 +255,11 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
$(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
$(FI)
+.IF "$(ZIP2STRIPLANGUAGETAGS)" != ""
+ $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+ $(SOLARENV)/bin/striplanguagetags.sh $@ \
+ $(FI)
+.ENDIF
.ENDIF # "$(ZIP2DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
.ENDIF
@@ -260,6 +280,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.IF "$(ZIP3TARGET)"!=""
+.IF "$(ZIP3STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
ZIP3EXT*=.zip
.IF "$(common_build_zip)"!=""
.IF "$(ZIP3LIST:s/LANGDIR//)" == "$(ZIP3LIST)"
@@ -363,6 +388,11 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
$(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
$(FI)
+.IF "$(ZIP3STRIPLANGUAGETAGS)" != ""
+ $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+ $(SOLARENV)/bin/striplanguagetags.sh $@ \
+ $(FI)
+.ENDIF
.ENDIF # "$(ZIP3DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
.ENDIF
@@ -383,6 +413,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.IF "$(ZIP4TARGET)"!=""
+.IF "$(ZIP4STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
ZIP4EXT*=.zip
.IF "$(common_build_zip)"!=""
.IF "$(ZIP4LIST:s/LANGDIR//)" == "$(ZIP4LIST)"
@@ -486,6 +521,11 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
$(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
$(FI)
+.IF "$(ZIP4STRIPLANGUAGETAGS)" != ""
+ $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+ $(SOLARENV)/bin/striplanguagetags.sh $@ \
+ $(FI)
+.ENDIF
.ENDIF # "$(ZIP4DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
.ENDIF
@@ -506,6 +546,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.IF "$(ZIP5TARGET)"!=""
+.IF "$(ZIP5STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
ZIP5EXT*=.zip
.IF "$(common_build_zip)"!=""
.IF "$(ZIP5LIST:s/LANGDIR//)" == "$(ZIP5LIST)"
@@ -609,6 +654,11 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS)
$(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
$(FI)
+.IF "$(ZIP5STRIPLANGUAGETAGS)" != ""
+ $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+ $(SOLARENV)/bin/striplanguagetags.sh $@ \
+ $(FI)
+.ENDIF
.ENDIF # "$(ZIP5DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
.ENDIF
@@ -629,6 +679,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.IF "$(ZIP6TARGET)"!=""
+.IF "$(ZIP6STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
ZIP6EXT*=.zip
.IF "$(common_build_zip)"!=""
.IF "$(ZIP6LIST:s/LANGDIR//)" == "$(ZIP6LIST)"
@@ -732,6 +787,11 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS)
$(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
$(FI)
+.IF "$(ZIP6STRIPLANGUAGETAGS)" != ""
+ $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+ $(SOLARENV)/bin/striplanguagetags.sh $@ \
+ $(FI)
+.ENDIF
.ENDIF # "$(ZIP6DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
.ENDIF
@@ -752,6 +812,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.IF "$(ZIP7TARGET)"!=""
+.IF "$(ZIP7STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
ZIP7EXT*=.zip
.IF "$(common_build_zip)"!=""
.IF "$(ZIP7LIST:s/LANGDIR//)" == "$(ZIP7LIST)"
@@ -855,6 +920,11 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS)
$(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
$(FI)
+.IF "$(ZIP7STRIPLANGUAGETAGS)" != ""
+ $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+ $(SOLARENV)/bin/striplanguagetags.sh $@ \
+ $(FI)
+.ENDIF
.ENDIF # "$(ZIP7DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
.ENDIF
@@ -875,6 +945,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.IF "$(ZIP8TARGET)"!=""
+.IF "$(ZIP8STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
ZIP8EXT*=.zip
.IF "$(common_build_zip)"!=""
.IF "$(ZIP8LIST:s/LANGDIR//)" == "$(ZIP8LIST)"
@@ -978,6 +1053,11 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS)
$(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
$(FI)
+.IF "$(ZIP8STRIPLANGUAGETAGS)" != ""
+ $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+ $(SOLARENV)/bin/striplanguagetags.sh $@ \
+ $(FI)
+.ENDIF
.ENDIF # "$(ZIP8DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
.ENDIF
@@ -998,6 +1078,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.IF "$(ZIP9TARGET)"!=""
+.IF "$(ZIP9STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
ZIP9EXT*=.zip
.IF "$(common_build_zip)"!=""
.IF "$(ZIP9LIST:s/LANGDIR//)" == "$(ZIP9LIST)"
@@ -1101,6 +1186,11 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS)
$(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
$(FI)
+.IF "$(ZIP9STRIPLANGUAGETAGS)" != ""
+ $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+ $(SOLARENV)/bin/striplanguagetags.sh $@ \
+ $(FI)
+.ENDIF
.ENDIF # "$(ZIP9DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
.ENDIF
@@ -1121,6 +1211,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.IF "$(ZIP10TARGET)"!=""
+.IF "$(ZIP10STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
ZIP10EXT*=.zip
.IF "$(common_build_zip)"!=""
.IF "$(ZIP10LIST:s/LANGDIR//)" == "$(ZIP10LIST)"
@@ -1224,6 +1319,11 @@ $(ZIP10TARGETN) : delzip $(ZIP10DEPS)
$(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
$(FI)
+.IF "$(ZIP10STRIPLANGUAGETAGS)" != ""
+ $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+ $(SOLARENV)/bin/striplanguagetags.sh $@ \
+ $(FI)
+.ENDIF
.ENDIF # "$(ZIP10DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
.ENDIF
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk
index 0a0364e..d3236fd 100644
--- a/solenv/inc/tg_zip.mk
+++ b/solenv/inc/tg_zip.mk
@@ -42,6 +42,11 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*"
.IF "$(ZIP$(TNR)TARGET)"!=""
+.IF "$(ZIP$(TNR)STRIPLANGUAGETAGS)" != ""
+CALLXSLTPROC:=$(XSLTPROC)
+.EXPORT: CALLXSLTPROC
+.ENDIF
+
ZIP$(TNR)EXT*=.zip
.IF "$(common_build_zip)"!=""
.IF "$(ZIP$(TNR)LIST:s/LANGDIR//)" == "$(ZIP$(TNR)LIST)"
@@ -145,6 +150,11 @@ $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS)
$(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
$(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
$(FI)
+.IF "$(ZIP$(TNR)STRIPLANGUAGETAGS)" != ""
+ $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
+ $(SOLARENV)/bin/striplanguagetags.sh $@ \
+ $(FI)
+.ENDIF
.ENDIF # "$(ZIP$(TNR)DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
.ENDIF
commit dbf79e8b23d8db677bb81d5dbe6f316485915d0f
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Jan 10 09:36:55 2011 +0000
BrOffice branding for windows shortcuts
diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp
index c678e74..2f6e606 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -29,6 +29,7 @@
FolderItem gid_Folderitem_Sbase
Name = "%PRODUCTNAME Base";
+ Name (pt-BR) = "%PRODUCTNAME_BR Base";
ModuleID = gid_Module_Prg_Base_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Sbase;
diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp
index 36cd965..c32ffa0 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -29,6 +29,7 @@
FolderItem gid_Folderitem_Scalc
Name = "%PRODUCTNAME Calc";
+ Name (pt-BR) = "%PRODUCTNAME_BR Calc";
ModuleID = gid_Module_Prg_Calc_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Scalc;
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
index 4a73948..2a302e5 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -29,6 +29,7 @@
FolderItem gid_Folderitem_Sdraw
Name = "%PRODUCTNAME Draw";
+ Name (pt-BR) = "%PRODUCTNAME_BR Draw";
ModuleID = gid_Module_Prg_Draw_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Sdraw;
diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp
index db7b0c3..e9a0708 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -29,6 +29,7 @@
FolderItem gid_Folderitem_Simpress
Name = "%PRODUCTNAME Impress";
+ Name (pt-BR) = "%PRODUCTNAME_BR Impress";
ModuleID = gid_Module_Prg_Impress_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Simpress;
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
index 2decfb2..49f1b8c 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -29,6 +29,7 @@
FolderItem gid_Folderitem_Smath
Name = "%PRODUCTNAME Math";
+ Name (pt-BR) = "%PRODUCTNAME_BR Math";
ModuleID = gid_Module_Prg_Math_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Smath;
diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
index b6ef81e..db3e5b1 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -29,6 +29,7 @@
FolderItem gid_Folderitem_Soffice
Name = "%PRODUCTNAME";
+ Name (pt-BR) = "%PRODUCTNAME_BR";
ModuleID = gid_Module_Root;
FolderID = gid_Folder_Staroffice51;
FileID = gid_Brand_File_Bin_Soffice;
@@ -42,6 +43,7 @@ End
FolderItem gid_Folderitem_Soffice_Desktop
Name = "%PRODUCTNAME %PRODUCTVERSION";
+ Name (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION";
ModuleID = gid_Module_Root;
FolderID = PREDEFINED_DESKTOP;
FileID = gid_Brand_File_Bin_Soffice;
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 6aa7c4e..24a2cba 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -627,6 +627,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
ModuleID = gid_Module_Root;
Name = "ApplicationName";
Value = "%PRODUCTNAME %PRODUCTVERSION";
+ Value (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION";
Styles = ();
End
diff --git a/scp2/source/quickstart/folderitem_quickstart.scp b/scp2/source/quickstart/folderitem_quickstart.scp
index b533637..9de0a7c 100644
--- a/scp2/source/quickstart/folderitem_quickstart.scp
+++ b/scp2/source/quickstart/folderitem_quickstart.scp
@@ -30,6 +30,7 @@
FolderItem gid_Folderitem_Exe_Quickstart
ModuleID = gid_Module_Optional_Quickstart;
Name = "%PRODUCTNAME %PRODUCTVERSION";
+ Name (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION";
FolderID = PREDEFINED_AUTOSTART;
FileID = gid_File_Exe_Install_Quickstart;
End
diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp
index 7541e1d..cf9d5ad 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -29,6 +29,7 @@
FolderItem gid_Folderitem_Swriter
Name = "%PRODUCTNAME Writer";
+ Name (pt-BR) = "%PRODUCTNAME_BR Writer";
ModuleID = gid_Module_Prg_Wrt_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Swriter;
commit 311548894adf50536933cd96083a237bc7b1f95b
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Jan 9 20:32:48 2011 +0100
Fix Barcode extension's directory
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 55d1c7a..37c56f9 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -216,7 +216,7 @@ End
File gid_File_Oxt_Barcode
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_Validator;
+ Dir = gid_Brand_Dir_Share_Extensions_Barcode;
Name = "Barcode.oxt";
End
commit a4696d85343509443e7c20e1fd88dcc091a5efac
Merge: ad3fab9... 83a81e0...
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Jan 7 19:49:11 2011 +0100
Merge commit 'ooo/OOO330_m19' into libreoffice-3-3
Conflicts:
solenv/inc/minor.mk
diff --cc solenv/inc/minor.mk
index 88bd80c,4c8eb6c..a830ab9
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
RSCVERSION=330
- RSCREVISION=330m18(Build:4)
-RSCREVISION=330m19(Build:9561)
-BUILD=9561
++RSCREVISION=330m19(Build:4)
+BUILD=4
- LAST_MINOR=m18
+ LAST_MINOR=m19
SOURCEVERSION=OOO330
commit ad3fab9cda307068ae4879d279960bbde893fe67
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Jan 5 19:27:15 2011 +0100
Fix distro specific about intro hadling
I guess that nobody uses more alternative branding pictures. It was implemented
for SLED10-GM and it is not longer needed there. So I renamed:
--with-intro-bitmaps to --with-intro-bitmap
--with-about-bitmaps to --with-about-bitmap
and
INTRO_BITMAPS to INTRO_BITMAPS
ABOUT_BITMAPS to ABOUT_BITMAP
Also .png file format is requred instead of .bmp now.
Signed off by KAMI.
diff --git a/configure.in b/configure.in
index 409c756..32c4601 100644
--- a/configure.in
+++ b/configure.in
@@ -1091,20 +1091,18 @@ AC_ARG_WITH(dict,
Usage: --with-dict=ENGB,ENUS,ITIT
],,)
-AC_ARG_WITH(intro-bitmaps,
-[ --with-intro-bitmaps Prefer the specified intro bitmaps over the
- the default one. Can be more than one (separated by
- commas), the order means priority of fallback if the
- first does not exist (in the installed tree).
+AC_ARG_WITH(intro-bitmap,
+[ --with-intro-bitmap Prefer the specified intro bitmap over the
+ the default one.
- Usage: --with-intro-bitmaps=/path/my_ooo_intro.bmp
+ Usage: --with-intro-bitmap=/path/my_ooo_intro.png
],,)
-AC_ARG_WITH(about-bitmaps,
-[ --with-about-bitmaps Similarly to --with-intro-bitmaps, this allows
- specification of bitmaps for the About box.
+AC_ARG_WITH(about-bitmap,
+[ --with-about-bitmap Similarly to --with-intro-bitmap, this allows
+ specification of bitmap for the About box.
- Usage: --with-about-bitmaps=/path/my_ooo_about.bmp
+ Usage: --with-about-bitmap=/path/my_ooo_about.png
],,)
AC_ARG_WITH(vendor,
@@ -7779,43 +7777,33 @@ else
fi
AC_SUBST(WITH_DICT)
-AC_MSG_CHECKING([for additional 'intro' bitmaps])
-INTRO_BITMAPS=
-if test -z "$with_intro_bitmaps" -o "$with_intro_bitmaps" = "no" ; then
- INTRO_BITMAPS=
+AC_MSG_CHECKING([for another 'intro' bitmap])
+INTRO_BITMAP=
+if test -z "$with_intro_bitmap" -o "$with_intro_bitmap" = "no" ; then
+ INTRO_BITMAP=
AC_MSG_RESULT([none])
else
- for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do
- case "$bitmap" in
- *.bmp) ;;
- *) bitmap= ; AC_MSG_WARN([Intro bitmaps should be .bmp files!]) ;;
- esac
- if test -n "$bitmap" ; then
- INTRO_BITMAPS="$INTRO_BITMAPS $bitmap"
- fi
- done
- AC_MSG_RESULT([$INTRO_BITMAPS])
+ case "$with_intro_bitmap" in
+ *.png) INTRO_BITMAP="$with_intro_bitmap" ;;
+ *) AC_MSG_WARN([Intro bitmap should be a .png file!]) ;;
+ esac
+ AC_MSG_RESULT([$INTRO_BITMAP])
fi
-AC_SUBST(INTRO_BITMAPS)
+AC_SUBST(INTRO_BITMAP)
-AC_MSG_CHECKING([for additional 'about' bitmaps])
-ABOUT_BITMAPS=
-if test -z "$with_about_bitmaps" -o "$with_about_bitmaps" = "no" ; then
- ABOUT_BITMAPS=
+AC_MSG_CHECKING([for another 'about' bitmap])
+ABOUT_BITMAP=
+if test -z "$with_about_bitmap" -o "$with_about_bitmap" = "no" ; then
+ ABOUT_BITMAP=
AC_MSG_RESULT([none])
else
- for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do
- case "$bitmap" in
- *.bmp) ;;
- *) bitmap= ; AC_MSG_WARN([About bitmaps should be .bmp files!]) ;;
- esac
- if test -n "$bitmap" ; then
- ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap"
- fi
- done
- AC_MSG_RESULT([$ABOUT_BITMAPS])
+ case "$with_about_bitmap" in
+ *.png) ABOUT_BITMAP="$with_about_bitmap" ;;
+ *) AC_MSG_WARN([About bitmap should be a .png file!]) ;;
+ esac
+ AC_MSG_RESULT([$ABOUT_BITMAP])
fi
-AC_SUBST(ABOUT_BITMAPS)
+AC_SUBST(ABOUT_BITMAP)
OOO_VENDOR=
AC_MSG_CHECKING([for vendor])
diff --git a/set_soenv.in b/set_soenv.in
index 6e51c4f..1c1e97b 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1630,8 +1630,8 @@ else
}
# Languages
ToFile( "WITH_LANG", "@WITH_LANG@", "e" );
-ToFile( "INTRO_BITMAPS", "@INTRO_BITMAPS@", "e" );
-ToFile( "ABOUT_BITMAPS", "@ABOUT_BITMAPS@", "e" );
+ToFile( "INTRO_BITMAP", "@INTRO_BITMAP@", "e" );
+ToFile( "ABOUT_BITMAP", "@ABOUT_BITMAP@", "e" );
ToFile( "OOO_VENDOR", "@OOO_VENDOR@", "e" );
ToFile( "OOODMAKEMODE", "YES", "e" );
ToFile( "WITH_POOR_HELP_LOCALIZATIONS", "@WITH_POOR_HELP_LOCALIZATIONS@", "e" );
commit 7a5b94f877de62eb9cd46954ba3a67e465625003
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Jan 6 20:47:15 2011 +0100
Fix check for BerkleyDB when db_create is macro
It seems more safe to check for dbopen; it has just one
other variant in db-3, see
http://lists.debian.org/debian-devel/2001/04/msg01770.html
diff --git a/configure.in b/configure.in
index 266f7e3..409c756 100644
--- a/configure.in
+++ b/configure.in
@@ -4312,12 +4312,16 @@ int main(int argc, char **argv) {
else return 1;
}
], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
- save_LIBS="$LIBS"
+ DB_LIB=
for dbver in '' -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4; do
- AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
+ AC_CHECK_LIB(db$dbver, dbopen, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ,
+ AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ]
+ )
+ )
done
- AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])
- LIBS="$save_LIBS"
+ if test -z "$DB_LIB" ; then
+ AC_MSG_ERROR([db not installed or functional])
+ fi
SCPDEFS="$SCPDEFS -DSYSTEM_DB"
else
AC_MSG_RESULT([internal])
commit 83a81e0c58326f481c74b9c957d41539124b6643
Author: Kurt Zenker <kz at openoffice.org>
Date: Thu Jan 6 17:27:00 2011 +0100
OOO330
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index d8732bc..4c8eb6c 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m18(Build:9556)
-BUILD=9556
-LAST_MINOR=m18
+RSCREVISION=330m19(Build:9561)
+BUILD=9561
+LAST_MINOR=m19
SOURCEVERSION=OOO330
commit e3583d232c311aed5e04a3ebb99d37335c7cd86f
Author: Andras Timar <timar at fsf.hu>
Date: Sun Jan 2 15:41:30 2011 +0100
New release of Linux Libertine G fonts
Signed-off-by: Kalman Szalai - KAMI <kami911 at gmail.com>
diff --git a/ooo.lst b/ooo.lst
index 802a85a..4ccdb6c 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -83,4 +83,4 @@ e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz
http://download.go-oo.org/extern
185d60944ea767075d27247c3162b3bc-unowinreg.dll
http://www.numbertext.org/linux
-c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip
+881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip
commit 2836ac2bd9ffea75e9a01c672cb107e1e015412a
Author: Andras Timar <timar at fsf.hu>
Date: Sun Jan 2 14:44:00 2011 +0100
typo fix in module_langpack.ulf
Signed-off-by: Jan Holesovsky <kendy at suse.cz>
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 3a050b4..3b5949d 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -766,7 +766,7 @@ en-US = "Installs Konkani support in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_LANGPACK_KS]
en-US = "Kashmiri"
-[STR_DESC_MODULE_LANGPACK_KS
+[STR_DESC_MODULE_LANGPACK_KS]
en-US = "Installs Kashmiri support in %PRODUCTNAME %PRODUCTVERSION"
[STR_NAME_MODULE_LANGPACK_KY]
commit 709068ae9b052c6d38e6a398c7aaaddc28232315
Author: Michael Meeks <michael.meeks at novell.com>
Date: Wed Jan 5 13:39:04 2011 +0000
ignore SIGPIPE for zenity
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index e6a7d96..896f90a 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -2160,6 +2160,7 @@ sub zenity_enabled {
sub zenity_open {
if (zenity_enabled()) {
+ $SIG{PIPE} = 'IGNORE';
my $zenity_pid = open3($zenity_in, $zenity_out, $zenity_err,
"zenity --notification --listen");
};
commit 7223f65beb36f1061e8bc12b418c7ecf9a9ed0e9
Author: Michael Meeks <michael.meeks at novell.com>
Date: Wed Jan 5 13:36:37 2011 +0000
only enable zenity for local (unix socket) displays
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 506c345..e6a7d96 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -2152,9 +2152,10 @@ sub print_announce {
};
sub zenity_enabled {
- return 0 if (!defined $ENV{DISPLAY});
return 0 if ($ENV{ENABLE_ZENITY} ne "TRUE");
- return 1;
+ return 0 if (!defined $ENV{DISPLAY});
+ return 1 if ($ENV{DISPLAY} =~ m/^:/); # local displays only
+ return 0;
}
sub zenity_open {
commit a1fc860c638a072924fd7733b4c09769acfa8ca3
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Mon Dec 20 19:28:42 2010 +0100
Update LightProof extensions' packing mechanism
* Install extracted extension files to separated and language dependent
directory. This is the new way to include extensions to installation
set.
* Update for Sun Template Pack packing
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 124be59..2d12668 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -96,6 +96,17 @@ End
/* ** Lightproof ** */
+#ifdef WITH_EXTENSION_LIGHTPROOF
+
+Directory gid_Brand_Dir_Share_Extensions_LightProof
+ ParentID = gid_Brand_Dir_Share_Extensions;
+ DosName (en-US) = "lightproof-en-US-0.1";
+ DosName (hu) = "lightproof-hu-1.2";
+ DosName = "lightproof";
+End
+
+#endif
+
/* ** Numbertext ** */
#ifdef WITH_EXTENSION_NUMBERTEXT
@@ -245,12 +256,13 @@ End
Directory gid_Brand_Dir_Share_Extensions_Sun_Template_Pack
ParentID = gid_Brand_Dir_Share_Extensions;
- DosName (en-US)= "Sun_ODF_Template_Pack_en-US";
+ DosName (en-US) = "Sun_ODF_Template_Pack_en-US";
DosName (de) = "Sun_ODF_Template_Pack_de";
- DosName (it) = "Sun_ODF_Template_Pack_it";
- DosName (fr) = "Sun_ODF_Template_Pack_fr";
DosName (es) = "Sun_ODF_Template_Pack_es";
+ DosName (fr) = "Sun_ODF_Template_Pack_fr";
DosName (hu) = "Sun_ODF_Template_Pack_hu";
+ DosName (it) = "Sun_ODF_Template_Pack_it";
+ DosName = "Sun_ODF_Template_Pack";
End
#endif
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 7b5d984..55d1c7a 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -111,9 +111,9 @@ End
File gid_File_Oxt_LightProof
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
- Dir = gid_Brand_Dir_Share_Extensions_Install;
- Name (hu) = "lightproof-hu-1.2.oxt";
+ Dir = gid_Brand_Dir_Share_Extensions_LightProof;
Name (en-US) = "lightproof-en-US-0.1.oxt";
+ Name (hu) = "lightproof-hu-1.2.oxt";
End
#endif
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 7d9683b..b1c771c 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -133,6 +133,7 @@ Module gid_Module_Optional_Extensions_LightProof
Default = YES;
Styles = ( );
End
+
#endif
/* ** Numbertext ** */
diff --git a/scp2/source/extensions/module_extensions_lightproof.scp b/scp2/source/extensions/module_extensions_lightproof.scp
index 7caa601..58aa59a 100644
--- a/scp2/source/extensions/module_extensions_lightproof.scp
+++ b/scp2/source/extensions/module_extensions_lightproof.scp
@@ -46,8 +46,7 @@ Module gid_Module_Optional_Extensions_LightProof_Template
Name = "gid_Module_Optional_Extensions_LightProof_Template";
Description = "gid_Module_Optional_Extensions_LightProof_Template";
Styles = (TEMPLATEMODULE);
- Files = (
- gid_File_Oxt_LightProof );
+ Files = ( gid_File_Oxt_LightProof );
Minimal = NO;
Default = YES;
End
diff --git a/scp2/source/extensions/module_extensions_sun_templates.scp b/scp2/source/extensions/module_extensions_sun_templates.scp
index bd6fe0a..6e5897e 100644
--- a/scp2/source/extensions/module_extensions_sun_templates.scp
+++ b/scp2/source/extensions/module_extensions_sun_templates.scp
@@ -46,8 +46,7 @@ Module gid_Module_Optional_Extensions_Sun_T_Pack_Template
Name = "gid_Module_Optional_Extensions_Sun_T_Pack_Template";
Description = "gid_Module_Optional_Extensions_Sun_T_Pack_Template";
Styles = (TEMPLATEMODULE);
- Files = (
- gid_File_Optional_Extensions_Sun_Template_Pack );
+ Files = ( gid_File_Optional_Extensions_Sun_Template_Pack );
Minimal = NO;
Default = YES;
End
More information about the Libreoffice-commits
mailing list