[Libreoffice-commits] .: 85 commits - bin/lo-commit-stat configure.in distro-configs/LibreOfficeMacOSX.conf distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWin32.conf download instsetoo_native/util post_download.in scp2/source set_soenv.in solenv/bin solenv/gbuild solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue May 31 02:01:28 PDT 2011
bin/lo-commit-stat | 1
configure.in | 35 ++--------
distro-configs/LibreOfficeMacOSX.conf | 5 -
distro-configs/OxygenOfficeLinux.conf | 2
distro-configs/OxygenOfficeWin32.conf | 2
download | 1
instsetoo_native/util/openoffice.lst | 48 ++++++-------
post_download.in | 2
scp2/source/impress/module_impress.scp | 5 -
scp2/source/ooo/module_ooo.scp | 2
scp2/source/writer/module_writer.scp | 1
set_soenv.in | 5 -
solenv/bin/modules/installer/download.pm | 3
solenv/bin/ooinstall | 10 ++
solenv/gbuild/CppunitTest.mk | 2
solenv/inc/langlist.mk | 37 ----------
solenv/inc/postset.mk | 107 -------------------------------
solenv/inc/rules.mk | 4 -
solenv/inc/settings.mk | 4 -
19 files changed, 63 insertions(+), 213 deletions(-)
New commits:
commit f9dbde552274288fdc10210fc7d846a130870535
Merge: 4f28494... f41a5da...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue May 31 10:46:15 2011 +0200
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap
commit 4f28494857882b9a367bd4ddd74e9f476f0cc92f
Merge: b260de7... 2a1d1c3...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue May 31 10:45:37 2011 +0200
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
configure.in
distro-configs/LibreOfficeMacOSX.conf
distro-configs/OxygenOfficeLinux.conf
distro-configs/OxygenOfficeWin32.conf
download
instsetoo_native/util/openoffice.lst
ooo.lst.in
set_soenv.in
solenv/bin/modules/installer/download.pm
solenv/gbuild/CppunitTest.mk
solenv/inc/minor.mk
solenv/inc/settings.mk
diff --cc bin/lo-commit-stat
index b6ec7ef,8c53ec9..8de4d31
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@@ -343,8 -343,8 +343,9 @@@ my $top_dir
my $log_prefix = "commit-log";
my $log_suffix;
my $log;
+my $branch_name;
my $git_command = "git log";
+ my $branch_name;
my @git_args;
my %data;
my %print_filters = ();
diff --cc set_soenv.in
index 724af0e,b2d6bfd..73c94e3
--- a/set_soenv.in
+++ b/set_soenv.in
@@@ -987,11 -1067,9 +987,12 @@@ $XCLASSPATH = '$JAVA_HOME'.$d
$L10N_MODULE = PathFormat($SRC_ROOT."/translations");
# Check for poor help localizations, i.e. no help translation at all...
-opendir(DIR,$L10N_MODULE . "/source");
- at languages = readdir(DIR);
-closedir(DIR);
+ at languages=();
+if (opendir(DIR,$L10N_MODULE . "/source"))
- { @languages = readdir(DIR);
- closedir(DIR);
++{
++ @languages = readdir(DIR);
++ closedir(DIR);
+}
$WITH_POOR_HELP_LOCALIZATIONS = "";
foreach $language (@languages)
diff --cc solenv/bin/modules/installer/download.pm
index 2bea17b,621d7ee..f463781
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@@ -472,7 -472,14 +472,8 @@@ sub get_downloadname_productnam
if ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP"; }
- if ( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) { $start = "BrOo"; }
- if ( $allvariables->{'PRODUCTNAME'} eq "BrOo-dev" ) { $start = "BrOo-Dev"; }
-
- if (( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "BrOo-SDK"; }
-
- if (( $allvariables->{'PRODUCTNAME'} eq "BrOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "BrOo-Dev-SDK"; }
+
return $start;
}
@@@ -1335,7 -1342,7 +1336,7 @@@ sub get_language_string_from_language_b
##################################################################
# Windows: Replacing strings in NSIS nsh file
# nsh file syntax:
--# !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis auswählen"
++# !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis ausw�hlen"
##################################################################
sub replace_identifier_in_nshfile
diff --cc solenv/gbuild/CppunitTest.mk
index b7049af,df8e8a6..3dbd33d
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@@ -43,27 -36,9 +43,27 @@@ endi
# gb_CppunitTest_TARGETTYPE
# gb_CppunitTest_get_filename
gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester)
- gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) LANG=en_US.UTF-8 $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_CPPTESTTARGET)
+ gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_CPPTESTTARGET)
gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
+# TODO: move this to platform under suitable name
+gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS)),/)$(1)
+
+gb_CppunitTest__get_uno_type_target = $(OUTDIR)/bin/$(1).rdb
+define gb_CppunitTest__make_args
+$(ARGS) \
+$(if $(strip $(UNO_TYPES)),\
+ "-env:UNO_TYPES=$(foreach rdb,udkapi $(UNO_TYPES),\
+ $(call gb_CppunitTarget__make_url,$(call gb_CppunitTest__get_uno_type_target,$(rdb))))") \
+$(if $(strip $(UNO_SERVICES)),\
+ "-env:UNO_SERVICES=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/ure/services.rdb) \
+ $(foreach rdb,$(UNO_SERVICES),\
+ $(call gb_CppunitTarget__make_url,$(call gb_RdbTarget_get_target,$(rdb))))") \
+$(if $(URE),\
+ $(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR,\
+ -env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib)))
+endef
+
.PHONY : $(call gb_CppunitTest_get_clean_target,%)
$(call gb_CppunitTest_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
commit 2a1d1c3c42e04639f5f76bbd418a447d59de6adf
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 24 19:29:09 2011 +0200
Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2)
commit c2f919306f6eee62a08a564d63f1e0fa7e8a82a2
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 24 19:14:13 2011 +0200
bump product version to 3.4.0-rc2, release number to 12
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 3b9a02d..5c10442 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -57,7 +57,7 @@ LibreOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
@@ -125,7 +125,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
@@ -189,7 +189,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
@@ -266,7 +266,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3.4
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
LICENSENAME LGPL
SETSTATICPATH 1
NOVERSIONINDIRNAME 1
@@ -305,7 +305,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.4
@@ -351,7 +351,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
@@ -403,7 +403,7 @@ OxygenOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
@@ -473,7 +473,7 @@ OxygenOffice_wJRE
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index abc4c85..dff20c4 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=340
-RSCREVISION=340m1(Build:11)
-BUILD=11
+RSCREVISION=340m1(Build:12)
+BUILD=12
LAST_MINOR=m1
SOURCEVERSION=OOO340
commit d18df035eca0fe7c5658dd35f8346edf69ef16c6
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed May 4 01:55:36 2011 +0200
always request an unversioned lib from gcc in gccinstlib.pl
* this otherwise breaks on ubuntu natty as there is (rightfully) no libgcc_s.so.1 file served by gcc -print-file-name
diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl
index 8ce9753..d8eda1c 100755
--- a/solenv/bin/gccinstlib.pl
+++ b/solenv/bin/gccinstlib.pl
@@ -38,19 +38,23 @@ if ($Dest =~ /--help/ || @ARGV < 1) {
print "Syntax:\n gcc-instlib <library-in-libpath ...> <destination-dir>\n";
exit (0);
}
+
+%SrcAndDest = ();
+
foreach $File (@ARGV) {
my $string;
-
- open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$File|") || die "Failed to exec $cc -print-file-name=$File $!";
+ my $normalized_file = $File;
+ $normalized_file =~ s/\.so\.\d+/.so/;
+ open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$normalized_file|") || die "Failed to exec $cc -print-file-name=$normalized_file $!";
$string=<GCCOut>;
chomp ($string);
- push (@CopySrc, $string);
+ $SrcAndDest{$string} = "$Dest/$File";
close (GCCOut);
}
-foreach $Src (@CopySrc) {
- printf "copy $Src to $Dest\n";
- system ("/bin/cp $Src $Dest") && die "copy failed: $!";
+while (($Src, $FullDest) = each %SrcAndDest) {
+ printf "copy $Src to $FullDest\n";
+ system ("/bin/cp $Src $FullDest") && die "copy failed: $!";
}
commit c37c37f4d978beafef3b5724dc93d72e6995e428
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 20:49:43 2011 +0200
Branch libreoffice-3-4-0
This is 'libreoffice-3-4-0' - the stable branch for the 3.4.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.4.x release,
please use the 'libreoffice-3-4' branch.
If you want to build something cool, unstable, and risky, use master.
commit f6609fd9bb8cbe0856af94be2bebd896c42280c3
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 19:55:27 2011 +0200
Version 3.4.0.1, tag libreoffice-3.4.0.1 (3.4.0-rc1)
commit e02ca76e82fbc331bf9c46895a9913e744f19a7a
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 19:38:48 2011 +0200
bump product version to 3.4.0-rc1, release number to 11
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 2fb7e97..3b9a02d 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -57,7 +57,7 @@ LibreOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta5
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
@@ -125,7 +125,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta5
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
@@ -189,7 +189,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta5
+ SHORT_PRODUCTEXTENSION rc1
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
@@ -266,7 +266,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3.4
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta5
+ SHORT_PRODUCTEXTENSION rc1
LICENSENAME LGPL
SETSTATICPATH 1
NOVERSIONINDIRNAME 1
@@ -305,7 +305,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta5
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.4
@@ -351,7 +351,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta5
+ SHORT_PRODUCTEXTENSION rc1
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
@@ -403,7 +403,7 @@ OxygenOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta5
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
@@ -473,7 +473,7 @@ OxygenOffice_wJRE
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta5
+ SHORT_PRODUCTEXTENSION rc1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index e079ebf..abc4c85 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=340
-RSCREVISION=340m1(Build:5)
-BUILD=5
+RSCREVISION=340m1(Build:11)
+BUILD=11
LAST_MINOR=m1
SOURCEVERSION=OOO340
commit e4bd1993189a5138e81c998b5a1c4e4777eaa4c9
Author: Michael Meeks <michael.meeks at novell.com>
Date: Tue May 17 15:23:40 2011 +0100
fix ENABLE_QUICKSTART_LIBPNG handling fdo#36497
diff --git a/configure.in b/configure.in
index 0705312..3257668 100755
--- a/configure.in
+++ b/configure.in
@@ -353,6 +353,13 @@ AC_ARG_ENABLE(kde4,
both KDE3 and KDE4.]),
,)
+AC_ARG_ENABLE(unix-qstart-libpng,
+ AS_HELP_STRING([--disable-unix-qstart-libpng],
+ [On UNIX systems, we have a faster splash app, that can use libpng to
+ render its splash, if we can safely link to the system libpng then
+ enabling this is a good idea (ie. for Linux Distro packaging).]),
+,enable_unix_libpng=yes)
+
AC_ARG_ENABLE(binfilter,
AS_HELP_STRING([--enable-binfilter],
[Enable legacy binary file formats filters build.]),
@@ -6136,16 +6143,17 @@ AC_SUBST(ENABLE_SYSTRAY_GTK)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-AC_ARG_ENABLE(unix-qstart,
- AS_HELP_STRING([--disable-unix-qstart],
- [On UNIX systems, we can enable a faster splash app that accelerates
- startup, if we can link to the system libpng, use this if you are
- a Linux Distro packager.]),
-,enable_unix_quickstarter=yes)
-
PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG="TRUE", ENABLE_QUICKSTART_LIBPNG="" )
AC_SUBST(LIBPNG_LIBS)
AC_SUBST(LIBPNG_CFLAGS)
+
+AC_MSG_CHECKING([whether to enable libpng linking in quickstarter])
+if test "x$enable_unix_libpng" = "xyes"; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+ ENABLE_QUICKSTART_LIBPNG=""
+fi
AC_SUBST(ENABLE_QUICKSTART_LIBPNG)
ENABLE_BROFFICE=""
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 3505963..2110064 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -43,7 +43,7 @@
--enable-cairo
--enable-binfilter
--disable-xrender-link
---disable-unix-qstart
+--disable-unix-qstart-libpng
--disable-randr-link
--disable-kde4
--disable-dbus
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index 340805a..db5f33e 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -8,7 +8,7 @@
--disable-odk
--disable-opengl
--disable-randr-link
---disable-unix-qstart
+--disable-unix-qstart-libpng
--disable-xrender-link
--enable-binfilter
--enable-cairo
commit b5196c4e52ed4bc136c17064159418f9dc86e3e2
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Tue May 17 11:47:52 2011 +0200
Enable nlpsolver also for Mac
Fix for fdo#37180
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 387b970..1fb7e4e 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -10,4 +10,5 @@
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
--enable-ext-scripting-python
+--enable-ext-nlpsolver
--with-extension-integration
commit 1d2f5bd3083b5c9bc30a0def9625bc61e5caf20b
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Mon May 16 15:51:10 2011 +0200
Revert "Upgrade graphite2 from 0.9.2 to 0.9.4"
Reverting changes because they break windows build.
This reverts commit a8ffbd10776df479f71c213e5f1deb5f9e866307.
diff --git a/ooo.lst.in b/ooo.lst.in
index 3509e2b..7a64faf 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -79,7 +79,7 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz
-1a5ae56d15e704a709010c5478fdf384-graphite2-0.9.4.tgz
+0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
http://download.go-oo.org/extern
185d60944ea767075d27247c3162b3bc-unowinreg.dll
b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
commit a8ffbd10776df479f71c213e5f1deb5f9e866307
Author: Martin Hosken <martin_hosken at sil.org>
Date: Mon May 16 15:04:54 2011 +0700
Upgrade graphite2 from 0.9.2 to 0.9.4
diff --git a/ooo.lst.in b/ooo.lst.in
index 7a64faf..3509e2b 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -79,7 +79,7 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz
-0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
+1a5ae56d15e704a709010c5478fdf384-graphite2-0.9.4.tgz
http://download.go-oo.org/extern
185d60944ea767075d27247c3162b3bc-unowinreg.dll
b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
commit b0859033e221bf30f980c33f9e4b48aa65a7ac05
Author: Martin Hosken <martin_hosken at sil.org>
Date: Mon May 16 14:35:50 2011 +0700
oops
diff --git a/ooo.lst b/ooo.lst
deleted file mode 100644
index 6a8ffec..0000000
--- a/ooo.lst
+++ /dev/null
@@ -1,111 +0,0 @@
-http://hg.services.openoffice.org/binaries
-48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
-63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
-09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
-0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
-128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
-17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
-18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
-26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
-284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
-2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz
-35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
-39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
-48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz
-4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
-4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz
-599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
-7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
-7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
-798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
-8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
-bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
-a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
-a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
-a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
-c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
-ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
-d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
-d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
-dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz
-e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
-e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
-e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
-ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
-ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
-ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
-fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
-fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
-fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip
-831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
-067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
-3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
-http://download.go-oo.org/src
-314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz
-451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
-90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
-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
-8d265a592619166f29c4672ea54812b7-libwpd-0.9.2.tar.bz2
-83d4029aebf290c0a9a8fee9c99638d3-libwps-0.2.1.tar.bz2
-7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
-f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz
-1a5ae56d15e704a709010c5478fdf384-graphite2-0.9.4.tgz
-http://download.go-oo.org/extern
-185d60944ea767075d27247c3162b3bc-unowinreg.dll
-b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
-http://www.numbertext.org/linux
-881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip
-http://ooo.itc.hu/oxygenoffice/download/libreoffice/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
commit 47005f52a4b9abb34c224111bda0dd492d2000d9
Author: Martin Hosken <martin_hosken at sil.org>
Date: Mon May 16 14:34:25 2011 +0700
Update to graphite2-0.9.4
diff --git a/ooo.lst b/ooo.lst
new file mode 100644
index 0000000..6a8ffec
--- /dev/null
+++ b/ooo.lst
@@ -0,0 +1,111 @@
+http://hg.services.openoffice.org/binaries
+48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
+63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
+09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
+0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
+128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
+17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
+18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
+26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
+284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
+2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz
+35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
+39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
+3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
+48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz
+4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
+4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz
+599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
+7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
+7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
+798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
+8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
+bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
+a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
+a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
+a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
+c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
+ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
+d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
+d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
+dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz
+e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
+e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
+e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
+ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
+ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
+ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
+fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
+fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
+fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip
+831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
+067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
+3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
+http://download.go-oo.org/src
+314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz
+451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
+47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
+90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
+debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
+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
+8d265a592619166f29c4672ea54812b7-libwpd-0.9.2.tar.bz2
+83d4029aebf290c0a9a8fee9c99638d3-libwps-0.2.1.tar.bz2
+7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
+f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz
+1a5ae56d15e704a709010c5478fdf384-graphite2-0.9.4.tgz
+http://download.go-oo.org/extern
+185d60944ea767075d27247c3162b3bc-unowinreg.dll
+b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
+http://www.numbertext.org/linux
+881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip
+http://ooo.itc.hu/oxygenoffice/download/libreoffice/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
commit c2f4991a21caf753e9c71c62be29333147ee0acb
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Mon May 16 08:32:56 2011 +0200
Build nlpsolver for Win32 and Linux release builds
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 3a0ba88..3505963 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -38,6 +38,7 @@
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
--enable-ext-scripting-python
+--enable-ext-nlpsolver
--enable-epm
--enable-cairo
--enable-binfilter
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index e7c031a..acc6320 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -16,3 +16,4 @@
--enable-ext-presenter-minimizer
--enable-ext-presenter-console
--enable-ext-pdfimport
+--enable-ext-nlpsolver
commit 77eb7f58d973eeb397dac0702646fc811894851c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Mon May 16 08:12:14 2011 +0200
Reverting one Oxygenoffice change until _KAMI_ makes it work
diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk
index 948d0c0..002c63a 100644
--- a/solenv/inc/productversion.mk
+++ b/solenv/inc/productversion.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-PRODUCTLIST = libreoffice broffice oxygenoffice
+PRODUCTLIST = libreoffice broffice
# default values to minimize maintainance effort
PRODUCTVERSION = 3.4
commit 9bb151438c4490469344379c2c3efee1c6ca87ab
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri May 13 10:10:36 2011 +0200
unrecognized options: --with-nlpsolver
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index 7fd08a6..e7c031a 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -4,7 +4,6 @@
--without-helppack-integration
--without-agfa-monotype-fonts
--with-extension-integration
---with-nlpsolver
--with-java-target-version=1.5
--disable-xrender-link
--disable-activex-component
commit 6db1c0424120dec7c2bcac5c01c2918f978ce4f3
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri May 13 09:21:17 2011 +0200
Enable binfilter explicitely for windows
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index 3458757..7fd08a6 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -3,10 +3,12 @@
--without-junit
--without-helppack-integration
--without-agfa-monotype-fonts
+--with-extension-integration
--with-nlpsolver
--with-java-target-version=1.5
--disable-xrender-link
--disable-activex-component
+--enable-binfilter
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
--enable-ext-scripting-python
@@ -15,4 +17,3 @@
--enable-ext-presenter-minimizer
--enable-ext-presenter-console
--enable-ext-pdfimport
---with-extension-integration
commit c291e364757a9461863cd2d0c55963cc70f1db77
Author: Radek Doulik <rodo at novell.com>
Date: Wed May 11 17:48:21 2011 +0200
change the version info so that we are not identified at runtime as 3.0.x
- fixes https://bugs.freedesktop.org/show_bug.cgi?id=37017
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index aad4f45..e079ebf 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
-RSCVERSION=300
-RSCREVISION=300m103(Build:5)
+RSCVERSION=340
+RSCREVISION=340m1(Build:5)
BUILD=5
-LAST_MINOR=m103
-SOURCEVERSION=DEV300
+LAST_MINOR=m1
+SOURCEVERSION=OOO340
commit 5aee299b17f206e99f4aaa87724695e0dad06c82
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu May 12 10:27:21 2011 +0300
Don't ship rebaseoo.exe and rebasegui.exe, fdo#36679
These are completely useless executables, and some virus scanners
thinks one of them is infected, so why even ship them...
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5f34ebc..47e5f9f 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -570,22 +570,6 @@ File gid_Brand_File_Bin_Unopkgexe
End
#endif
-#ifdef WNT
-File gid_Brand_File_Bin_Rebaseoo
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Styles = (PACKED);
- Name = "rebaseoo.exe";
-End
-
-File gid_Brand_File_Bin_Rebasegui
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Styles = (PACKED);
- Name = "rebasegui.exe";
-End
-#endif
-
#if defined UNX && !defined MACOSX
File gid_Brand_File_Script_Unopkg
BIN_FILE_BODY;
commit 16f9691579f35f050b064c3679df2fc3554ba354
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Wed May 4 04:45:32 2011 +0200
Add OxygenOffice related settings
* Start download package name with OOOP in case of OxygenOffice
* Ability to create oxygenoffice product
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 05bc77a..621d7ee 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -469,6 +469,8 @@ sub get_downloadname_productname
if (( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; }
if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; }
+
+ if ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP"; }
if ( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) { $start = "BrOo"; }
diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk
index 002c63a..948d0c0 100644
--- a/solenv/inc/productversion.mk
+++ b/solenv/inc/productversion.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-PRODUCTLIST = libreoffice broffice
+PRODUCTLIST = libreoffice broffice oxygenoffice
# default values to minimize maintainance effort
PRODUCTVERSION = 3.4
commit 4e44e1dae5b02820c3d1452d51112acc07207ab5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed May 11 12:46:47 2011 +0300
AC_SUBST also OOOBLOGGER_EXTENSION_PACK as set_soenv.in uses it
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/configure.in b/configure.in
index d1d2152..0705312 100755
--- a/configure.in
+++ b/configure.in
@@ -7300,6 +7300,7 @@ else
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_OOOBLOGGER"
OOOBLOGGER_EXTENSION_PACK="b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt"
fi
+AC_SUBST(OOOBLOGGER_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Sun Professional Template Pack
commit ef47a7cd01ce45f66f264b7201c60259f019d75d
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Wed May 11 11:18:37 2011 +0200
Fix oooblogger extension download mechanism
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/configure.in b/configure.in
index 0c47e01..d1d2152 100755
--- a/configure.in
+++ b/configure.in
@@ -7294,9 +7294,11 @@ dnl ===================================================================
AC_MSG_CHECKING([for oooblogger extension integration])
if test "z$enable_ext_oooblogger" = "z" -o "z$enable_ext_oooblogger" = "zno" ; then
AC_MSG_RESULT([no])
+ OOOBLOGGER_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_OOOBLOGGER"
+ OOOBLOGGER_EXTENSION_PACK="b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt"
fi
dnl ===================================================================
diff --git a/download b/download
index a353687..e2c209e 100755
--- a/download
+++ b/download
@@ -298,7 +298,7 @@ done
# Extensions copy
echo "Copy extensions to their location ..."
-for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
+for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $OOOBLOGGER_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
check_file $TARFILE_LOCATION/$pack
packfilename=`echo "$pack" | cut -f 2- -s -d - | cut -f 1 -d _`
echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
diff --git a/ooo.lst.in b/ooo.lst.in
index 8566ef0..7a64faf 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -99,6 +99,7 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
@HUNART_EXTENSION_PACK@
@TYPO_EXTENSION_PACK@
@GOOGLE_DOCS_EXTENSION_PACK@
+ at OOOBLOGGER_EXTENSION_PACK@
@LIGHTPROOF_EN_US_PACK@
@LIGHTPROOF_HU_PACK@
@SUNTEMPLATES_DE_PACK@
diff --git a/set_soenv.in b/set_soenv.in
index a21178f..b2d6bfd 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1887,6 +1887,7 @@ ToFile( "NUMBERTEXT_EXTENSION_PACK", "@NUMBERTEXT_EXTENSION_PACK@","e" );
ToFile( "HUNART_EXTENSION_PACK", "@HUNART_EXTENSION_PACK@","e" );
ToFile( "TYPO_EXTENSION_PACK", "@TYPO_EXTENSION_PACK@","e" );
ToFile( "GOOGLE_DOCS_EXTENSION_PACK", "@GOOGLE_DOCS_EXTENSION_PACK@","e" );
+ToFile( "OOOBLOGGER_EXTENSION_PACK", "@OOOBLOGGER_EXTENSION_PACK@","e" );
ToFile( "SUNTEMPLATES_LANG", "@SUNTEMPLATES_LANG@","e" );
ToFile( "SUNTEMPLATES_DE_PACK", "@SUNTEMPLATES_DE_PACK@","e" );
ToFile( "SUNTEMPLATES_EN_US_PACK", "@SUNTEMPLATES_EN_US_PACK@","e" );
commit e070f5298f161c47fc34145c405d0c6cc82a7298
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun May 8 19:30:24 2011 +0200
When downloading extensions to src, cut is provided with wrong option switches
I used long switches for cut and your (Windows??) box does not adore about it.
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/10214
diff --git a/download b/download
index 1b9c699..a353687 100755
--- a/download
+++ b/download
@@ -300,7 +300,7 @@ done
echo "Copy extensions to their location ..."
for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
check_file $TARFILE_LOCATION/$pack
- packfilename=`echo "$pack" | cut --only-delimited --delimiter=- --fields=2- | cut --delimiter=_ --fields=1`
+ packfilename=`echo "$pack" | cut -f 2- -s -d - | cut -f 1 -d _`
echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
mkdir -p $SRC_ROOT/extras/source/extensions/ || exit 1
cp $TARFILE_LOCATION/$pack $SRC_ROOT/extras/source/extensions/$packfilename.oxt || exit 1
commit b973b670860f74d9bf4f42affcd364f48354ff15
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun May 8 11:18:46 2011 +0200
Fix space and tab jam in my last commit
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/configure.in b/configure.in
index 768e1a8..0c47e01 100755
--- a/configure.in
+++ b/configure.in
@@ -7331,14 +7331,14 @@ else
for lang in $wanted_sun_templates ; do
if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
- case $lang in
- "de") SUNTEMPLATES_DE_PACK="53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt";;
- "en-US") SUNTEMPLATES_EN_US_PACK="472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt";;
- "es") SUNTEMPLATES_ES_PACK="4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt";;
- "fr") SUNTEMPLATES_FR_PACK="a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt";;
- "hu") SUNTEMPLATES_HU_PACK="09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt";;
- "it") SUNTEMPLATES_IT_PACK="b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt";;
- esac
+ case $lang in
+ "de") SUNTEMPLATES_DE_PACK="53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt";;
+ "en-US") SUNTEMPLATES_EN_US_PACK="472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt";;
+ "es") SUNTEMPLATES_ES_PACK="4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt";;
+ "fr") SUNTEMPLATES_FR_PACK="a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt";;
+ "hu") SUNTEMPLATES_HU_PACK="09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt";;
+ "it") SUNTEMPLATES_IT_PACK="b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt";;
+ esac
fi
done
AC_MSG_RESULT([$SUNTEMPLATES_LANG])
commit 7b64870186c80e1dfb4112aaa51bdf662db9691b
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun May 8 11:14:57 2011 +0200
Fix SUN Template extension configure, download, handling
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/configure.in b/configure.in
index 81ed085..768e1a8 100755
--- a/configure.in
+++ b/configure.in
@@ -7321,15 +7321,35 @@ else
done
fi
SUNTEMPLATES_LANG=
+ SUNTEMPLATES_DE_PACK=
+ SUNTEMPLATES_EN_US_PACK=
+ SUNTEMPLATES_ES_PACK=
+ SUNTEMPLATES_FR_PACK=
+ SUNTEMPLATES_HU_PACK=
+ SUNTEMPLATES_IT_PACK=
# check whether the langs are requested at all
for lang in $wanted_sun_templates ; do
if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
+ case $lang in
+ "de") SUNTEMPLATES_DE_PACK="53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt";;
+ "en-US") SUNTEMPLATES_EN_US_PACK="472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt";;
+ "es") SUNTEMPLATES_ES_PACK="4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt";;
+ "fr") SUNTEMPLATES_FR_PACK="a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt";;
+ "hu") SUNTEMPLATES_HU_PACK="09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt";;
+ "it") SUNTEMPLATES_IT_PACK="b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt";;
+ esac
fi
done
AC_MSG_RESULT([$SUNTEMPLATES_LANG])
fi
AC_SUBST(SUNTEMPLATES_LANG)
+AC_SUBST(SUNTEMPLATES_DE_PACK)
+AC_SUBST(SUNTEMPLATES_EN_US_PACK)
+AC_SUBST(SUNTEMPLATES_ES_PACK)
+AC_SUBST(SUNTEMPLATES_FR_PACK)
+AC_SUBST(SUNTEMPLATES_HU_PACK)
+AC_SUBST(SUNTEMPLATES_IT_PACK)
dnl ===================================================================
dnl Test whether to include fonts
diff --git a/download b/download
index 127be9e..1b9c699 100755
--- a/download
+++ b/download
@@ -298,7 +298,7 @@ done
# Extensions copy
echo "Copy extensions to their location ..."
-for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK; do
+for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
check_file $TARFILE_LOCATION/$pack
packfilename=`echo "$pack" | cut --only-delimited --delimiter=- --fields=2- | cut --delimiter=_ --fields=1`
echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
diff --git a/ooo.lst.in b/ooo.lst.in
index c4084d0..8566ef0 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -101,4 +101,10 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
@GOOGLE_DOCS_EXTENSION_PACK@
@LIGHTPROOF_EN_US_PACK@
@LIGHTPROOF_HU_PACK@
+ at SUNTEMPLATES_DE_PACK@
+ at SUNTEMPLATES_EN_US_PACK@
+ at SUNTEMPLATES_ES_PACK@
+ at SUNTEMPLATES_FR_PACK@
+ at SUNTEMPLATES_HU_PACK@
+ at SUNTEMPLATES_IT_PACK@
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index ff61178..a2b48ec 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -295,12 +295,12 @@ File gid_File_Optional_Extensions_Sun_Template_Pack
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_Sun_Template_Pack;
- Name (en-US) = "Sun_ODF_Template_Pack_en-US.oxt";
- Name (de) = "Sun_ODF_Template_Pack_de.oxt";
- Name (it) = "Sun_ODF_Template_Pack_it.oxt";
- Name (fr) = "Sun_ODF_Template_Pack_fr.oxt";
- Name (es) = "Sun_ODF_Template_Pack_es.oxt";
- Name (hu) = "Sun_ODF_Template_Pack_hu.oxt";
+ Name (en-US) = "Sun-ODF-Template-Pack-en-US.oxt";
+ Name (de) = "Sun-ODF-Template-Pack-de.oxt";
+ Name (it) = "Sun-ODF-Template-Pack-it.oxt";
+ Name (fr) = "Sun-ODF-Template-Pack-fr.oxt";
+ Name (es) = "Sun-ODF-Template-Pack-es.oxt";
+ Name (hu) = "Sun-ODF-Template-Pack-hu.oxt";
End
#endif
diff --git a/set_soenv.in b/set_soenv.in
index 6e99498..a21178f 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1887,6 +1887,13 @@ ToFile( "NUMBERTEXT_EXTENSION_PACK", "@NUMBERTEXT_EXTENSION_PACK@","e" );
ToFile( "HUNART_EXTENSION_PACK", "@HUNART_EXTENSION_PACK@","e" );
ToFile( "TYPO_EXTENSION_PACK", "@TYPO_EXTENSION_PACK@","e" );
ToFile( "GOOGLE_DOCS_EXTENSION_PACK", "@GOOGLE_DOCS_EXTENSION_PACK@","e" );
+ToFile( "SUNTEMPLATES_LANG", "@SUNTEMPLATES_LANG@","e" );
+ToFile( "SUNTEMPLATES_DE_PACK", "@SUNTEMPLATES_DE_PACK@","e" );
+ToFile( "SUNTEMPLATES_EN_US_PACK", "@SUNTEMPLATES_EN_US_PACK@","e" );
+ToFile( "SUNTEMPLATES_ES_PACK", "@SUNTEMPLATES_ES_PACK@","e" );
+ToFile( "SUNTEMPLATES_FR_PACK", "@SUNTEMPLATES_FR_PACK@","e" );
+ToFile( "SUNTEMPLATES_HU_PACK", "@SUNTEMPLATES_HU_PACK@","e" );
+ToFile( "SUNTEMPLATES_IT_PACK", "@SUNTEMPLATES_IT_PACK@","e" );
ToFile( "LIGHTPROOF_EN_US_PACK", "@LIGHTPROOF_EN_US_PACK@","e" );
ToFile( "LIGHTPROOF_HU_PACK", "@LIGHTPROOF_HU_PACK@","e" );
ToFile( "LIGHTPROOF_LANG", "@LIGHTPROOF_LANG@", "e" );
commit 014274fbb85caf07d61954108b891b6ae72516f0
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun May 8 10:25:25 2011 +0200
Fix Ligthproof extension integration
* Fix configure and download support
* Extension naming scheme is: <md5>-<extension-name>_<version>.oxt
- Renamed extensions
* Rename extension version number in download script and scp2 module
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/configure.in b/configure.in
index 73e86aa..81ed085 100755
--- a/configure.in
+++ b/configure.in
@@ -7106,7 +7106,7 @@ if test "z$enable_ext_lightproof" = "z" -o "z$enable_ext_lightproof" = "zno" ; t
AC_MSG_RESULT([no integration])
else
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF"
- lightproof_supported_langs="hu"
+ lightproof_supported_langs="en-US hu"
if test "z$enable_ext_lightproof" = "zyes" ; then
wanted_lightproof="$lightproof_supported_langs"
else
@@ -7119,15 +7119,23 @@ else
done
fi
LIGHTPROOF_LANG=
+ LIGHTPROOF_HU_PACK=
+ LIGHTPROOF_EN_US_PACK=
# check whether the langs are requested at all
for lang in $wanted_lightproof ; do
if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
+ case $lang in
+ "hu") LIGHTPROOF_HU_PACK="324ddcb9ef45c3bc055fcc002bc4e556-lightproof-hu_1.2.oxt";;
+ "en-US") LIGHTPROOF_EN_US_PACK="942541da5f5498214518c8b459ae4524-lightproof-en-US_0.1.oxt";;
+ esac
fi
done
AC_MSG_RESULT([$LIGHTPROOF_LANG])
fi
AC_SUBST(LIGHTPROOF_LANG)
+AC_SUBST(LIGHTPROOF_HU_PACK)
+AC_SUBST(LIGHTPROOF_EN_US_PACK)
dnl ===================================================================
dnl Test whether to include Watch Window extension
@@ -7196,7 +7204,7 @@ else
AC_MSG_RESULT([yes])
BUILD_TYPE="$BUILD_TYPE CT2N"
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
- CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
+ CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt"
fi
AC_SUBST(CT2N_EXTENSION_PACK)
@@ -7224,7 +7232,7 @@ if test "z$enable_ext_hunart" = "z" -o "z$enable_ext_hunart" = "zno" ; then
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_HUNART"
- HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart-0.3.oxt"
+ HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt"
fi
AC_SUBST(HUNART_EXTENSION_PACK)
@@ -7238,7 +7246,7 @@ if test "z$enable_ext_typo" = "z" -o "z$enable_ext_typo" = "zno" ; then
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_TYPO"
- TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo-0.4.2.oxt"
+ TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt"
fi
AC_SUBST(TYPO_EXTENSION_PACK)
diff --git a/download b/download
index abe4c79..127be9e 100755
--- a/download
+++ b/download
@@ -298,9 +298,9 @@ done
# Extensions copy
echo "Copy extensions to their location ..."
-for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK ; do
+for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK; do
check_file $TARFILE_LOCATION/$pack
- packfilename=`echo "$pack" | cut --only-delimited --delimiter=- --fields=2 | cut --delimiter=_ --fields=1`
+ packfilename=`echo "$pack" | cut --only-delimited --delimiter=- --fields=2- | cut --delimiter=_ --fields=1`
echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
mkdir -p $SRC_ROOT/extras/source/extensions/ || exit 1
cp $TARFILE_LOCATION/$pack $SRC_ROOT/extras/source/extensions/$packfilename.oxt || exit 1
diff --git a/ooo.lst.in b/ooo.lst.in
index f20a385..c4084d0 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -99,4 +99,6 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
@HUNART_EXTENSION_PACK@
@TYPO_EXTENSION_PACK@
@GOOGLE_DOCS_EXTENSION_PACK@
+ at LIGHTPROOF_EN_US_PACK@
+ at LIGHTPROOF_HU_PACK@
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index b8919bc..ff61178 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -112,8 +112,8 @@ File gid_File_Oxt_LightProof
TXT_FILE_BODY;
Styles = (PACKED, ARCHIVE);
Dir = gid_Brand_Dir_Share_Extensions_LightProof;
- Name (en-US) = "lightproof-en-US-0.1.oxt";
- Name (hu) = "lightproof-hu-1.2.oxt";
+ Name (en-US) = "lightproof-en-US.oxt";
+ Name (hu) = "lightproof-hu.oxt";
End
#endif
diff --git a/set_soenv.in b/set_soenv.in
index 522de78..6e99498 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1887,6 +1887,9 @@ ToFile( "NUMBERTEXT_EXTENSION_PACK", "@NUMBERTEXT_EXTENSION_PACK@","e" );
ToFile( "HUNART_EXTENSION_PACK", "@HUNART_EXTENSION_PACK@","e" );
ToFile( "TYPO_EXTENSION_PACK", "@TYPO_EXTENSION_PACK@","e" );
ToFile( "GOOGLE_DOCS_EXTENSION_PACK", "@GOOGLE_DOCS_EXTENSION_PACK@","e" );
+ToFile( "LIGHTPROOF_EN_US_PACK", "@LIGHTPROOF_EN_US_PACK@","e" );
+ToFile( "LIGHTPROOF_HU_PACK", "@LIGHTPROOF_HU_PACK@","e" );
+ToFile( "LIGHTPROOF_LANG", "@LIGHTPROOF_LANG@", "e" );
ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" );
ToFile( "WITH_AGFA_MONOTYPE_FONTS", "@WITH_AGFA_MONOTYPE_FONTS@", "e" );
ToFile( "WITHOUT_AFMS", "@WITHOUT_AFMS@", "e" );
commit cc7f5e0155b4e0be3f716ca88a54216513a41874
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed May 11 14:42:47 2011 +0200
Enable extensions and bundle them in Windows build by default
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index 257ce70..3458757 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -10,3 +10,9 @@
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
--enable-ext-scripting-python
+--enable-ext-wiki-publisher
+--enable-ext-report-builder
+--enable-ext-presenter-minimizer
+--enable-ext-presenter-console
+--enable-ext-pdfimport
+--with-extension-integration
commit 204be6a1afcd61e49b3fbc28ebf59e60968ea37e
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Wed May 11 11:24:25 2011 +0200
Fix Numbertext extension's download filename
diff --git a/configure.in b/configure.in
index 522b705..73e86aa 100755
--- a/configure.in
+++ b/configure.in
@@ -7210,7 +7210,7 @@ if test "z$enable_ext_numbertext" = "z" -o "z$enable_ext_numbertext" = "zno" ; t
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NUMBERTEXT"
- NUMBERTEXT_EXTENSION_PACK="b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext-0.9.4.oxt"
+ NUMBERTEXT_EXTENSION_PACK="b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt"
fi
AC_SUBST(NUMBERTEXT_EXTENSION_PACK)
commit 27297297fbbfc682b6219ee94fa354ce9f5b8d47
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 10 20:01:35 2011 +0200
Version 3.3.99.5, tag libreoffice-3.3.99.5 (3.4.0-beta5)
commit 3bf9afa291ce079bc630552e942f851263bc6d95
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 10 18:03:46 2011 +0200
bump product version to 3.4.0-beta5, release number to 5
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 4383d2f..2fb7e97 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -57,7 +57,7 @@ LibreOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta4
+ SHORT_PRODUCTEXTENSION beta5
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
@@ -125,7 +125,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta4
+ SHORT_PRODUCTEXTENSION beta5
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
@@ -189,7 +189,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta4
+ SHORT_PRODUCTEXTENSION beta5
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
@@ -266,7 +266,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3.4
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta4
+ SHORT_PRODUCTEXTENSION beta5
LICENSENAME LGPL
SETSTATICPATH 1
NOVERSIONINDIRNAME 1
@@ -305,7 +305,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta4
+ SHORT_PRODUCTEXTENSION beta5
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.4
@@ -351,7 +351,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta4
+ SHORT_PRODUCTEXTENSION beta5
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
@@ -403,7 +403,7 @@ OxygenOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta4
+ SHORT_PRODUCTEXTENSION beta5
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
@@ -473,7 +473,7 @@ OxygenOffice_wJRE
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta4
+ SHORT_PRODUCTEXTENSION beta5
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index fafb788..aad4f45 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=300
-RSCREVISION=300m103(Build:4)
-BUILD=4
+RSCREVISION=300m103(Build:5)
+BUILD=5
LAST_MINOR=m103
SOURCEVERSION=DEV300
commit bfe31c7f915a540bc48a3adfd6ae11e2426f0e59
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 10 19:37:31 2011 +0200
use build id for the release number also for deb packages
I have just realised that deb packages used milestone as
the release number; it is bumped only when we merge
changes from OOo; so, we should use the build id that
is used as the release number for rpms and windows build
for a long time
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 2e6ef99..4383d2f 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -75,7 +75,7 @@ LibreOffice
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.4.0
- PACKAGEREVISION {milestone}
+ PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
@@ -142,7 +142,7 @@ LibreOffice_wJRE
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.4.0
- PACKAGEREVISION {milestone}
+ PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
GLOBALFILEGID gid_File_Lib_Vcl
@@ -212,7 +212,7 @@ LibreOffice_Dev
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.4.0
- PACKAGEREVISION {milestone}
+ PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
@@ -310,7 +310,7 @@ LibreOffice_SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.4
PACKAGEVERSION 3.4.0
- PACKAGEREVISION {milestone}
+ PACKAGEREVISION {buildid}
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
@@ -358,7 +358,7 @@ LibreOffice_Dev_SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.4
PACKAGEVERSION 3.4.0
- PACKAGEREVISION {milestone}
+ PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX libobasis-dev
UREPACKAGEPREFIX lodev
SOLSUREPACKAGEPREFIX lodev
@@ -421,7 +421,7 @@ OxygenOffice
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.4.0
- PACKAGEREVISION {milestone}
+ PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1
GLOBALFILEGID gid_File_Lib_Vcl
@@ -490,7 +490,7 @@ OxygenOffice_wJRE
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION 3.4.0
- PACKAGEREVISION {milestone}
+ PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1
WITHJREPRODUCT 1
commit 8b11467d9512f3340db780dec88ef02749322fdf
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Tue May 10 12:10:55 2011 +0200
Clean up MacOS distro config from cruft
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 28f49fa..387b970 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,8 +1,6 @@
--with-vendor=The Document Foundation
---enable-opengl
---enable-hids
+--enable-epm
--enable-binfilter
---with-fonts
--with-java-target-version=1.5
--enable-ext-presenter-minimizer
--enable-ext-presenter-console
commit e2e91282b721da52269a2984e1d0b310a0ac6d4e
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Mon May 9 16:18:13 2011 +0200
Unit test locale now forced by other means
This was only working for Linux, anyway.
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 5c33719..df8e8a6 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -36,7 +36,7 @@ export DBGSV_ERROR_OUT
# gb_CppunitTest_TARGETTYPE
# gb_CppunitTest_get_filename
gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester)
-gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) LANG=en_US.UTF-8 $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_CPPTESTTARGET)
+gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_CPPTESTTARGET)
gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
.PHONY : $(call gb_CppunitTest_get_clean_target,%)
commit 45a67e09fcd92531ee029287877410e84b3fc8e6
Author: Robert Nagy <robert at openbsd.org>
Date: Mon May 9 16:08:45 2011 +0200
use Cwd::realpath to avoid confusion with symlinked dirs
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 103cacb..b356866 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -161,7 +161,7 @@ sub getparameter
elsif ($param eq "-destdir") # new parameter for simple installer
{
$installer::globals::rootpath ne "" && die "must set destdir before -i or -simple";
- $installer::globals::destdir = shift @ARGV;
+ $installer::globals::destdir = Cwd::realpath( shift @ARGV );
}
elsif ($param eq "-simple") # new parameter for simple installer
{
commit 49dac3eff5f5af1a401d9839fd3caef57b0e404f
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Mon May 9 10:59:19 2011 +0200
OxygenOffice progressbar
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index d8460cc..2e6ef99 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -439,6 +439,10 @@ OxygenOffice
PATCHCODEFILE ooo_patchcodes.txt
DOWNLOADBANNER ooobanner_ooop.bmp
DOWNLOADBITMAP ooobitmap_ooop.bmp
+ PROGRESSBARCOLOR 126,170,23
+ PROGRESSSIZE 430,5
+ PROGRESSPOSITION 5,230
+ PROGRESSFRAMECOLOR 207,208,211
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
@@ -507,6 +511,10 @@ OxygenOffice_wJRE
DOWNLOADBANNER ooobanner_ooop.bmp
DOWNLOADBITMAP ooobitmap_ooop.bmp
DOWNLOADSETUPICO ooosetup.ico
+ PROGRESSBARCOLOR 126,170,23
+ PROGRESSSIZE 430,5
+ PROGRESSPOSITION 5,230
+ PROGRESSFRAMECOLOR 207,208,211
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
STARTCENTER_INFO_URL http://www.libreoffice.org/
commit e8a303ca06515d052f13d934c40a31c153ca592b
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun May 8 22:59:35 2011 +0200
Additional settings for OxygenOffice product
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 785b203..d8460cc 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -400,7 +400,6 @@ OxygenOffice
variables
{
PRODUCTNAME OxygenOffice
- PRODUCTNAME_BR OxygenOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -436,12 +435,10 @@ OxygenOffice
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.3.0
+ LIBRARYVERSION 9.4.0
PATCHCODEFILE ooo_patchcodes.txt
DOWNLOADBANNER ooobanner_ooop.bmp
DOWNLOADBITMAP ooobitmap_ooop.bmp
- DOWNLOADBANNER_BR ooobanner_ooop.bmp
- DOWNLOADBITMAP_BR ooobitmap_ooop.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
@@ -469,7 +466,6 @@ OxygenOffice_wJRE
variables
{
PRODUCTNAME OxygenOffice
- PRODUCTNAME_BR OxygenOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -479,7 +475,7 @@ OxygenOffice_wJRE
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.4.0
- BASEPRODUCTVERSION 3.3
+ BASEPRODUCTVERSION 3.4
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
@@ -505,13 +501,11 @@ OxygenOffice_wJRE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.3.0
+ LIBRARYVERSION 9.4.0
PATCHCODEFILE ooo_patchcodes.txt
JAVAPRODUCT 1
DOWNLOADBANNER ooobanner_ooop.bmp
DOWNLOADBITMAP ooobitmap_ooop.bmp
- DOWNLOADBANNER_BR ooobanner_ooop.bmp
- DOWNLOADBITMAP_BR ooobitmap_ooop.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
commit 838aba9d2f29464ffbecbdd12fa9e39ec7ce6dd6
Author: Andras Timar <atimar at novell.com>
Date: Sun May 8 17:37:27 2011 +0200
Missing bundled English dictionary extension dict-en - fdo#36926
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 3142ac6..293878b 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -149,7 +149,7 @@ Module gid_Module_Root_Extension_Dictionary_En
Files = (gid_File_Extension_Dictionary_En);
InstallOrder = "2000";
Sortkey = "550";
- Spellcheckerlanguage = "en-US";
+ Spellcheckerlanguage = "en";
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Dictionaries;
Styles = ();
commit 64d20e2131c73bed72d10f5201390c8b2e4c8e62
Author: Andras Timar <atimar at novell.com>
Date: Sun May 8 06:35:21 2011 +0200
Revert "use $realpath()" - fdo#36927
This reverts commit 5fbddf4910999590edcf557efa1a6a4b9cdd5664.
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 2db1d80..24123d1 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -47,7 +47,7 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target,transex3)
# gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
-gb_SrsPartMergeTarget_SDFLOCATION := $(realpath $(SRCDIR)/translations/$(INPATH)/misc/sdf/)
+gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
define gb_SrsPartMergeTarget__command
commit e477b46fa6e1af660578e34e31d9b690622c005a
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Sat May 7 01:10:22 2011 +0200
Remove reference to binned config option.
diff --git a/configure.in b/configure.in
index e941e98..522b705 100755
--- a/configure.in
+++ b/configure.in
@@ -2907,7 +2907,7 @@ else
AC_LANG_POP([C++])
else
AC_MSG_RESULT([no])
- AC_MSG_NOTICE([ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip])
+ AC_MSG_NOTICE([ccache version $CCACHE_VERSION not accepted. ccache will not be used.])
fi
fi
fi
commit 23f4ddbb2a66064925964d9f9f5bc1cfb6031288
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri May 6 19:32:42 2011 +0200
allow to install LO-3.3 and LO-3.4 in parallel on Linux (fdo#36551)
* rename the branding packages from libreoffice3 to libreoffice3.4
* move the default root dir from /opt/libreoffice to /opt/libreoffice3.4
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 5124dde..785b203 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -9,7 +9,7 @@ Globals
UREPACKAGEVERSION 3.4.0
URELAYERVERSION 1
BASISROOTNAME LibreOffice
- UNIXBASISROOTNAME libreoffice
+ UNIXBASISROOTNAME libreoffice3.4
SERVICETAG_PRODUCTNAME LibreOffice 3.4
SERVICETAG_PRODUCTVERSION 3.4
SERVICETAG_PARENTNAME LibreOffice 3.4
@@ -60,7 +60,7 @@ LibreOffice
SHORT_PRODUCTEXTENSION beta4
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
+ BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.4.0
BASEPRODUCTVERSION 3.4
@@ -128,7 +128,7 @@ LibreOffice_wJRE
SHORT_PRODUCTEXTENSION beta4
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
+ BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.4.0
BASEPRODUCTVERSION 3.4
@@ -194,7 +194,7 @@ LibreOffice_Dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
+ BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.4.0
BASEPRODUCTVERSION 3.4
@@ -264,7 +264,7 @@ URE
PACKAGEVERSION 3.4
PACKAGEREVISION 1
PRODUCTEXTENSION
- BRANDPACKAGEVERSION 3
+ BRANDPACKAGEVERSION 3.4
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION beta4
LICENSENAME LGPL
@@ -308,7 +308,7 @@ LibreOffice_SDK
SHORT_PRODUCTEXTENSION beta4
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
- BRANDPACKAGEVERSION 3
+ BRANDPACKAGEVERSION 3.4
PACKAGEVERSION 3.4.0
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
@@ -356,7 +356,7 @@ LibreOffice_Dev_SDK
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
- BRANDPACKAGEVERSION 3
+ BRANDPACKAGEVERSION 3.4
PACKAGEVERSION 3.4.0
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX libobasis-dev
@@ -407,7 +407,7 @@ OxygenOffice
SHORT_PRODUCTEXTENSION beta4
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
+ BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.4.0
BASEPRODUCTVERSION 3.4
@@ -476,7 +476,7 @@ OxygenOffice_wJRE
SHORT_PRODUCTEXTENSION beta4
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
+ BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.4.0
BASEPRODUCTVERSION 3.3
commit cdaa2734d07bcb1a10689f1ebaba7e8b54d41094
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri May 6 15:42:59 2011 +0200
Removed --ccache-skip configure option
Not much point in forcing that - people should upgrade their ccache
to >=3.1 on Mac (change not affecting any other platform)
diff --git a/configure.in b/configure.in
index 3646be8..e941e98 100755
--- a/configure.in
+++ b/configure.in
@@ -403,15 +403,6 @@ AC_ARG_ENABLE(check-only,
],
,)
-AC_ARG_ENABLE(ccache-skip,
- AS_HELP_STRING([--enable-ccache-skip],
- [Allow the use of --ccache-skip to escape compiler flags that would
- otherwise prevent caching of the result (currently used on Mac only)
- NOTE: requires patched version because of a bug in ccache (see issue
- 104567 for details and patch) explicitly enable if your version of
- ccache doesn't identify as version 2.4_OOo. (default=auto)]),
-,enable_ccache_skip=auto)
-
AC_ARG_ENABLE(build-unowinreg,
AS_HELP_STRING([--enable-build-unowinreg],
[Do not use the prebuilt unowinreg.dll. Build it instead. The MinGW C++
@@ -2879,19 +2870,14 @@ fi
AC_SUBST(HAVE_CXX0X)
# ===================================================================
-# use --ccache-skip?
+# use ccache?
# ===================================================================
-dnl used to escape compiler options for ccache that otherwise prevent
+dnl need to check for ccache version: otherwise prevents
dnl caching of the results (like "-x objective-c++" for Mac)
-AC_MSG_CHECKING([whether we are allowed and able to use --ccache-skip])
+AC_MSG_CHECKING([whether we are able to use --ccache-skip])
if test "$_os" != "Darwin" ; then
AC_MSG_RESULT([only used on Mac currently, skipping])
-elif test "$enable_ccache_skip" = "no" ; then
- AC_MSG_RESULT([no - diabled explicitly])
-elif test "$enable_ccache_skip" = "yes" ; then
- AC_MSG_RESULT([yes - enabled explicitly, skipping checks])
- AC_SUBST([USE_CCACHE], [YES])
-elif test "$enable_ccache_skip" = "auto" ; then
+else
# checking for ccache presence/version
AC_MSG_RESULT([probing...])
AC_PATH_PROG([CCACHE],[ccache],[not_found])
@@ -2924,8 +2910,6 @@ elif test "$enable_ccache_skip" = "auto" ; then
AC_MSG_NOTICE([ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip])
fi
fi
-else
- AC_MSG_ERROR([invalid option to --enable-ccache-skip. Valid values are "auto", "yes" and "no"])
fi
dnl ===================================================================
commit aa5c850dc4ef0200659445ae228560e49f0d76e6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri May 6 10:35:53 2011 +0300
Use MKDIRHIER to avoid "File exists" errors (which are ignored, but still)
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index db97edd..0ff659c 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -715,14 +715,14 @@ $(MISC)/%.sh : %.sh
.IF "$(WITH_LANG)"!=""
$(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
@echo "Making: " $(@:f)
- $(COMMAND_ECHO)-$(MKDIR) $(@:d)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
$(COMMONMISC)/$(TARGET)/%.xrb : %.xrb
- $(COMMAND_ECHO)-$(MKDIR) $(@:d)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
commit 06c6ac14944ba7df439e5915db0f95c0709ea3f9
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu May 5 16:47:57 2011 +0200
Auto-accept ccache >= 3.1 on Mac
The reason for the selective rejection of everything but a patched
ccache on Mac was broken objective-c/c++ support and a memory
corruption on arg parse - both are fixed on 3.0 and 3.1,
respectively. See http://ccache.samba.org/releasenotes.html
diff --git a/configure.in b/configure.in
index 939d567..3646be8 100755
--- a/configure.in
+++ b/configure.in
@@ -2901,7 +2901,8 @@ elif test "$enable_ccache_skip" = "auto" ; then
# check ccache version
AC_MSG_CHECKING([whether version of ccache is suitable])
CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'`
- if test "$CCACHE_VERSION" = "2.4_OOo"; then
+ CCACHE_NUMVER=`echo $CCACHE_VERSION | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+ if test "$CCACHE_VERSION" = "2.4_OOo" -o "$CCACHE_NUMVER" -ge "030100"; then
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([whether ccache is actually used for the build])
AC_LANG_PUSH([C++])
commit 5fbddf4910999590edcf557efa1a6a4b9cdd5664
Author: Andras Timar <atimar at novell.com>
Date: Thu May 5 11:01:46 2011 +0200
use $realpath()
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 24123d1..2db1d80 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -47,7 +47,7 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target,transex3)
# gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
-gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
+gb_SrsPartMergeTarget_SDFLOCATION := $(realpath $(SRCDIR)/translations/$(INPATH)/misc/sdf/)
gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
define gb_SrsPartMergeTarget__command
commit 55627a48b1753f584e78e975af4d3b5d13d0db39
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu May 5 07:50:18 2011 +0200
Fix ooinstall -l case
Removing destdir prefix for dev-install case is not a good idea
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 4afdb23..89aea81 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -28,11 +28,13 @@ for $arg (@ARGV) {
} elsif ($arg eq '-h' || $arg eq '--help') {
$help = 1;
} else {
- # Cwd::realpath does not work if the path does not exist
- mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
- $path = Cwd::realpath( $ENV{DESTDIR} . $arg );
- my $destdir = Cwd::realpath( $ENV{DESTDIR} );
- $path =~ s|$destdir||;
+ # Cwd::realpath does not work if the path does not exist
+ mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
+ $path = Cwd::realpath( $ENV{DESTDIR} . $arg );
+ if (!$do_link) {
+ my $destdir = Cwd::realpath( $ENV{DESTDIR} );
+ $path =~ s|$destdir||;
+ }
}
}
commit b66d73dec37f748917627ce525f428825b7d9089
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Wed May 4 04:55:31 2011 +0200
Refine lication of OxygenOffice splash
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index d2050eb..a1a4327 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -1,5 +1,7 @@
--with-vendor=OxygenOffice Professional Team
--with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0
+--with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png
+--with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png
--enable-binfilter
--enable-vba
--enable-build-mozilla
diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf
index 45927e0..ba6f999 100644
--- a/distro-configs/OxygenOfficeWin32.conf
+++ b/distro-configs/OxygenOfficeWin32.conf
@@ -1,5 +1,7 @@
--with-vendor=OxygenOffice Professional Team
--with-build-version=OxygenOffice Professional Beta 3.4.0 M000 - OxygenOffice Build 0
+--with-intro-bitmap=$TARFILE_LOCATION/openintro_ooop.png
+--with-about-bitmap=$TARFILE_LOCATION/openabout_ooop.png
--enable-binfilter
--enable-vba
--disable-build-mozilla
commit 08a8f790026dd4dc2d8f72cba93958ffbc90e0f0
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Wed May 4 04:54:34 2011 +0200
Remove already integrated fonts from extra fonts
diff --git a/scp2/source/accessories/file_font_accessories.scp b/scp2/source/accessories/file_font_accessories.scp
index 2683ed9..9adbe4b 100644
--- a/scp2/source/accessories/file_font_accessories.scp
+++ b/scp2/source/accessories/file_font_accessories.scp
@@ -880,22 +880,3 @@ STD_FONT_FILE( gid_File_Fnt_Verina_Serif_Bold, Verina_Serif_Bold.otf, Verina Ser
STD_FONT_FILE( gid_File_Fnt_Verina_Serif, Verina_Serif.otf, Verina Serif )
#endif
-#ifdef WITH_EXTRA_FONT
-STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinum, MagyarLinBiolinum.ttf, Magyar Linux Biolinum)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinumB, MagyarLinBiolinumB.ttf, Magyar Linux Biolinum Bold)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertine, MagyarLinLibertine.ttf, Magyar Linux Libertine)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineB, MagyarLinLibertineB.ttf, Magyar Linux Libertine Bold)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineBI, MagyarLinLibertineBI.ttf, Magyar Linux Libertine Bold Italic)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineC, MagyarLinLibertineC_Re.ttf, Magyar Linux Libertine Capital)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineG, MagyarLinLibertineG.ttf, Magyar Linux Libertine Graphite)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGB, MagyarLinLibertineGB.ttf, Magyar Linux Libertine Bold Graphite)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGBI, MagyarLinLibertineGBI.ttf, Magyar Linux Libertine Bold Italic Graphite)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGI, MagyarLinLibertineGI.ttf, Magyar Linux Libertine Italic Graphite)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineI, MagyarLinLibertineI.ttf, Magyar Linux Libertine Italic)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineN, MagyarLinLibertineN.ttf, Magyar Linux N Libertine)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNB, MagyarLinLibertineNB.ttf, Magyar Linux Libertine N Bold)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNBI, MagyarLinLibertineNBI.ttf, Magyar Linux Libertine N Bold Italic)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNI, MagyarLinLibertineNI.ttf, Magyar Linux Libertine N Italic)
-STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNC, MagyarLinLibertineNC_Re.ttf, Magyar Linux Libertine N Capital)
-#endif
-
commit b7bc669766dcae71653d57dde01db1d2ae6ed734
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Apr 24 10:53:35 2011 +0200
Add copy and extract for extras and few extensions
diff --git a/download b/download
index 45c356c..abe4c79 100755
--- a/download
+++ b/download
@@ -34,6 +34,18 @@ fi
# we want to clone if we are in the bootstrap git repo and clone does not exist yet
# we need to test for a .git in order not to clone after rsync if we are called in
# the inner autogen of the buid-repo based build
+
+check_file()
+{
+ echo "Looking for $1 ..."
+ if test -f $1; then
+ echo "ok"
+ else
+ echo "missing required archive; run './download' again";
+ exit 1;
+ fi
+}
+
if [ -d .git ] ; then
if [ -z "$GIT_LINK_SRC" ]; then
./g -f clone
@@ -276,6 +288,24 @@ if [ "$GUI" = "WNT" -a -n "$md5sum" ]; then
fi
fi
+# OxygenOffice extras
+echo "Unpacking OxygenOffice extras ..."
+for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
+ check_file $TARFILE_LOCATION/$pack
+ echo "Unpacking $pack ..."
+ unzip -o -q $TARFILE_LOCATION/$pack -d $SRC_ROOT/extras/source
+done
+
+# Extensions copy
+echo "Copy extensions to their location ..."
+for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK ; do
+ check_file $TARFILE_LOCATION/$pack
+ packfilename=`echo "$pack" | cut --only-delimited --delimiter=- --fields=2 | cut --delimiter=_ --fields=1`
+ echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
+ mkdir -p $SRC_ROOT/extras/source/extensions/ || exit 1
+ cp $TARFILE_LOCATION/$pack $SRC_ROOT/extras/source/extensions/$packfilename.oxt || exit 1
+done
+
[ -x "post_download" ] || { echo "'post_download' script not found, run ./autogen.sh." ; exit 1 ; }
./post_download || exit 1
diff --git a/set_soenv.in b/set_soenv.in
index a1bd947..522de78 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1874,6 +1874,19 @@ ToFile( "MOZ_NSPR_CFLAGS", "@MOZ_NSPR_CFLAGS@", "e" );
ToFile( "MOZ_NSS_CFLAGS", "@MOZ_NSS_CFLAGS@", "e" );
ToFile( "MOZ_NSS_LIBS", "@MOZ_NSS_LIBS@", "e" );
ToFile( "MOZ_LDAP_CFLAGS", "@MOZ_LDAP_CFLAGS@", "e" );
+ToFile( "OOOP_GALLERY_PACK", "@OOOP_GALLERY_PACK@","e" );
+ToFile( "OOOP_TEMPLATES_PACK", "@OOOP_TEMPLATES_PACK@","e" );
+ToFile( "OOOP_FONTS_PACK", "@OOOP_FONTS_PACK@","e" );
+ToFile( "OOOP_SAMPLES_PACK", "@OOOP_SAMPLES_PACK@","e" );
+ToFile( "CT2N_EXTENSION_PACK", "@CT2N_EXTENSION_PACK@","e" );
+ToFile( "BARCODE_EXTENSION_PACK", "@BARCODE_EXTENSION_PACK@","e" );
+ToFile( "DIAGRAM_EXTENSION_PACK", "@DIAGRAM_EXTENSION_PACK@","e" );
+ToFile( "VALIDATOR_EXTENSION_PACK", "@VALIDATOR_EXTENSION_PACK@","e" );
+ToFile( "WATCH_WINDOW_EXTENSION_PACK", "@WATCH_WINDOW_EXTENSION_PACK@","e" );
+ToFile( "NUMBERTEXT_EXTENSION_PACK", "@NUMBERTEXT_EXTENSION_PACK@","e" );
+ToFile( "HUNART_EXTENSION_PACK", "@HUNART_EXTENSION_PACK@","e" );
+ToFile( "TYPO_EXTENSION_PACK", "@TYPO_EXTENSION_PACK@","e" );
+ToFile( "GOOGLE_DOCS_EXTENSION_PACK", "@GOOGLE_DOCS_EXTENSION_PACK@","e" );
ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" );
ToFile( "WITH_AGFA_MONOTYPE_FONTS", "@WITH_AGFA_MONOTYPE_FONTS@", "e" );
ToFile( "WITHOUT_AFMS", "@WITHOUT_AFMS@", "e" );
commit 8647a5a6e70b0c478bc26b419d4651ec6df47260
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Apr 23 09:31:45 2011 +0200
Add download support to a few extension in bootstrap
diff --git a/configure.in b/configure.in
index 895d43b..939d567 100755
--- a/configure.in
+++ b/configure.in
@@ -7150,11 +7150,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Watch Window extension integration])
if test "z$enable_ext_watch_window" = "z" -o "z$enable_ext_watch_window" = "zno" ; then
AC_MSG_RESULT([no])
+ WATCH_WINDOW_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_WATCH_WINDOW"
+ WATCH_WINDOW_EXTENSION_PACK="23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt"
fi
-AC_SUBST(WITH_WATCH_WINDOW_EXTENSION)
+AC_SUBST(WATCH_WINDOW_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Diagram extension
@@ -7162,11 +7164,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Diagram extension integration])
if test "z$enable_ext_diagram" = "z" -o "z$enable_ext_diagram" = "zno" ; then
AC_MSG_RESULT([no])
+ DIAGRAM_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_DIAGRAM"
+ DIAGRAM_EXTENSION_PACK="41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt"
fi
-AC_SUBST(WITH_DIAGRAM_EXTENSION)
+AC_SUBST(DIAGRAM_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Validator extension
@@ -7174,11 +7178,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Validator extension integration])
if test "z$enable_ext_validator" = "z" -o "z$enable_ext_validator" = "zno" ; then
AC_MSG_RESULT([no])
+ VALIDATOR_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_VALIDATOR"
+ VALIDATOR_EXTENSION_PACK="bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt"
fi
-AC_SUBST(WITH_VALIDATOR_EXTENSION)
+AC_SUBST(VALIDATOR_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Barcode extension
@@ -7186,11 +7192,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Barcode extension integration])
if test "z$enable_ext_barcode" = "z" -o "z$enable_ext_barcode" = "zno" ; then
AC_MSG_RESULT([no])
+ BARCODE_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_BARCODE"
+ BARCODE_EXTENSION_PACK="7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt"
fi
-AC_SUBST(WITH_BARCODE_EXTENSION)
+AC_SUBST(BARCODE_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include ConvertTextToNumber extension
@@ -7198,11 +7206,14 @@ dnl ===================================================================
AC_MSG_CHECKING([for ConvertTextToNumber extension integration])
if test "z$enable_ext_ct2n" = "z" -o "z$enable_ext_ct2n" = "zno" ; then
AC_MSG_RESULT([no])
+ CT2N_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
BUILD_TYPE="$BUILD_TYPE CT2N"
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
+ CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
fi
+AC_SUBST(CT2N_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Numbertext extension
@@ -7210,11 +7221,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Numbertext extension integration])
if test "z$enable_ext_numbertext" = "z" -o "z$enable_ext_numbertext" = "zno" ; then
AC_MSG_RESULT([no])
+ NUMBERTEXT_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NUMBERTEXT"
+ NUMBERTEXT_EXTENSION_PACK="b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext-0.9.4.oxt"
fi
-AC_SUBST(WITH_NUMBERTEXT_EXTENSION)
+AC_SUBST(NUMBERTEXT_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Hungarian Cross-reference Toolbar extension
@@ -7222,11 +7235,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Hungarian Cross-reference Toolbar extension integration])
if test "z$enable_ext_hunart" = "z" -o "z$enable_ext_hunart" = "zno" ; then
AC_MSG_RESULT([no])
+ HUNART_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_HUNART"
+ HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart-0.3.oxt"
fi
-AC_SUBST(WITH_HUNART_EXTENSION)
+AC_SUBST(HUNART_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Typography Toolbar extension
@@ -7234,11 +7249,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Typography Toolbar extension integration])
if test "z$enable_ext_typo" = "z" -o "z$enable_ext_typo" = "zno" ; then
AC_MSG_RESULT([no])
+ TYPO_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_TYPO"
+ TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo-0.4.2.oxt"
fi
-AC_SUBST(WITH_TYPO_EXTENSION)
+AC_SUBST(TYPO_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include Google Docs extension
@@ -7246,10 +7263,13 @@ dnl ===================================================================
AC_MSG_CHECKING([for Google Docs extension integration])
if test "z$enable_ext_google_docs" = "z" -o "z$enable_ext_google_docs" = "zno" ; then
AC_MSG_RESULT([no])
+ GOOGLE_DOCS_EXTENSION_PACK=""
else
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS"
+ GOOGLE_DOCS_EXTENSION_PACK="dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt"
fi
+AC_SUBST(GOOGLE_DOCS_EXTENSION_PACK)
dnl ===================================================================
dnl Test whether to include NLPSolver extension
diff --git a/ooo.lst.in b/ooo.lst.in
index 94d69c2..f20a385 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -90,4 +90,13 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
@OOOP_TEMPLATES_PACK@
@OOOP_FONTS_PACK@
@OOOP_SAMPLES_PACK@
+ at CT2N_EXTENSION_PACK@
+ at BARCODE_EXTENSION_PACK@
+ at DIAGRAM_EXTENSION_PACK@
+ at VALIDATOR_EXTENSION_PACK@
+ at WATCH_WINDOW_EXTENSION_PACK@
+ at NUMBERTEXT_EXTENSION_PACK@
+ at HUNART_EXTENSION_PACK@
+ at TYPO_EXTENSION_PACK@
+ at GOOGLE_DOCS_EXTENSION_PACK@
commit 7dfd3269e6129bb1eaaa2ade04e1edcdfb102670
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 3 20:01:33 2011 +0200
Version 3.3.99.4, tag libreoffice-3.3.99.4 (3.4.0-beta4)
commit 26d4cc7493b575c413476dc6aa93c403f048fb11
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 3 20:00:22 2011 +0200
bump product version to 3.4.0-beta4, release number to 4
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 71f88d3..5124dde 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -57,7 +57,7 @@ LibreOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta3
+ SHORT_PRODUCTEXTENSION beta4
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -125,7 +125,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta3
+ SHORT_PRODUCTEXTENSION beta4
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -189,7 +189,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta3
+ SHORT_PRODUCTEXTENSION beta4
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
@@ -266,7 +266,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta3
+ SHORT_PRODUCTEXTENSION beta4
LICENSENAME LGPL
SETSTATICPATH 1
NOVERSIONINDIRNAME 1
@@ -305,7 +305,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta3
+ SHORT_PRODUCTEXTENSION beta4
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
@@ -351,7 +351,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta3
+ SHORT_PRODUCTEXTENSION beta4
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
@@ -404,7 +404,7 @@ OxygenOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta3
+ SHORT_PRODUCTEXTENSION beta4
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -473,7 +473,7 @@ OxygenOffice_wJRE
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION beta3
+ SHORT_PRODUCTEXTENSION beta4
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index f3346e7..fafb788 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=300
-RSCREVISION=300m103(Build:3)
-BUILD=3
+RSCREVISION=300m103(Build:4)
+BUILD=4
LAST_MINOR=m103
SOURCEVERSION=DEV300
commit 3709e6a8ecdd18dec008094a11f90b3d99d837f9
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 3 17:05:11 2011 +0200
Enable extern scripting for offical LO builds (fdo#33355)
Added the following options to distro-configs/LibreOffice*.conf:
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
--enable-ext-scripting-python
Thanks David Tardon <dtardon at redhat.com> for tip
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 4a59607..3a0ba88 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -35,6 +35,9 @@
--enable-ext-presenter-minimizer
--enable-ext-presenter-console
--enable-ext-pdfimport
+--enable-ext-scripting-beanshell
+--enable-ext-scripting-javascript
+--enable-ext-scripting-python
--enable-epm
--enable-cairo
--enable-binfilter
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 207a715..28f49fa 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -9,4 +9,7 @@
--enable-ext-pdfimport
--enable-ext-wiki-publisher
--enable-ext-report-builder
+--enable-ext-scripting-beanshell
+--enable-ext-scripting-javascript
+--enable-ext-scripting-python
--with-extension-integration
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index 050bb7c..257ce70 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -7,3 +7,6 @@
--with-java-target-version=1.5
--disable-xrender-link
--disable-activex-component
+--enable-ext-scripting-beanshell
+--enable-ext-scripting-javascript
+--enable-ext-scripting-python
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
index 1a9ce95..889237f 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -4,3 +4,6 @@
--enable-cl-x64
--disable-xrender-link
--disable-activex-component
+--enable-ext-scripting-beanshell
+--enable-ext-scripting-javascript
+--enable-ext-scripting-python
commit 17adf76bb37afc368a674adfd8e9e2b61faf6e93
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 3 15:14:26 2011 +0200
ooinstall: use DESTDIR also for the Cwd::realpath call
this solution is not perfect because Cwd::realpath($ENV{DESTDIR})
need not be part of Cwd::realpath($ENV{DESTDIR} . $arg). Let's
solve this when it really cause troubles.
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 47c06cb..4afdb23 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -30,7 +30,9 @@ for $arg (@ARGV) {
} else {
# Cwd::realpath does not work if the path does not exist
mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
- $path = Cwd::realpath( $arg );
+ $path = Cwd::realpath( $ENV{DESTDIR} . $arg );
+ my $destdir = Cwd::realpath( $ENV{DESTDIR} );
+ $path =~ s|$destdir||;
}
}
commit b9dd2241c60635ba15929ffad9962928460bd3ec
Author: Miklos Vajna <vmiklos at frugalware.org>
Date: Tue May 3 14:27:06 2011 +0200
ooinstall: respect DESTDIR
The problem was that ooinstall just passed -destdir to
make_installer.pl, but before that, it tried to create the root
directory, where it did not respect DESTDIR.
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 83717fa..47c06cb 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -29,7 +29,7 @@ for $arg (@ARGV) {
$help = 1;
} else {
# Cwd::realpath does not work if the path does not exist
- mkpath($arg) unless -d $arg;
+ mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
$path = Cwd::realpath( $arg );
}
}
commit 1fd180e6e1796696775d8431e6c9e522ae1f2060
Author: Miklos Vajna <vmiklos at frugalware.org>
Date: Tue May 3 12:14:13 2011 +0200
configure: fix help text of --with-install-dirname
diff --git a/configure.in b/configure.in
index 81cc513..895d43b 100755
--- a/configure.in
+++ b/configure.in
@@ -1208,7 +1208,7 @@ AC_ARG_WITH(install-dirname,
[Specify the directory name of the core LibO install dir. The final
installation path is defined by <libdir>/<install-dirname>.
The default value is "libreoffice" and the default installation
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list