[Libreoffice-commits] .: 3 commits - configure.in distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf instsetoo_native/util scp2/source set_soenv.in solenv/bin solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Apr 26 04:42:22 PDT 2011
configure.in | 16 -------
distro-configs/LibreOfficeLinux.conf | 1
distro-configs/LibreOfficeMacOSX.conf | 1
distro-configs/LibreOfficeOpenBSD.conf | 1
distro-configs/LibreOfficeWin32.conf | 1
distro-configs/LibreOfficeWin64.conf | 1
instsetoo_native/util/makefile.mk | 50 ----------------------
instsetoo_native/util/openoffice.lst | 11 ----
scp2/source/base/folderitem_base.scp | 1
scp2/source/calc/folderitem_calc.scp | 1
scp2/source/draw/folderitem_draw.scp | 1
scp2/source/impress/folderitem_impress.scp | 1
scp2/source/math/folderitem_math.scp | 1
scp2/source/ooo/folderitem_ooo.scp | 2
scp2/source/ooo/installation_ooo.scp | 1
scp2/source/ooo/registryitem_ooo.scp | 1
scp2/source/quickstart/folderitem_quickstart.scp | 1
scp2/source/writer/folderitem_writer.scp | 1
set_soenv.in | 1
solenv/bin/modules/installer/download.pm | 9 ---
solenv/bin/modules/installer/windows/directory.pm | 3 -
solenv/bin/modules/installer/windows/property.pm | 5 --
solenv/inc/productversion.mk | 2
23 files changed, 2 insertions(+), 111 deletions(-)
New commits:
commit a060ae9849fc54798ff7f6ce55c3c33aa7cbebf2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Apr 26 12:47:14 2011 +0300
Kill BrOffice, fdo#36262
diff --git a/configure.in b/configure.in
index 6466aa8..47f6190 100755
--- a/configure.in
+++ b/configure.in
@@ -275,12 +275,6 @@ AC_ARG_ENABLE(systray,
[Determines whether to build the systray quickstarter.]),
,enable_systray=yes)
-AC_ARG_ENABLE(broffice,
- AS_HELP_STRING([--disable-broffice],
- [When disabled, broffice specific branding artwork for use in the pt_BR
- locale is removed, giving uniform branding.]),
-,enable_broffice=no)
-
AC_ARG_ENABLE(cairo,
AS_HELP_STRING([--disable-cairo],
[Determines whether to use Cairo library on platforms where Cairo is
@@ -6085,16 +6079,6 @@ AC_SUBST(LIBPNG_LIBS)
AC_SUBST(LIBPNG_CFLAGS)
AC_SUBST(ENABLE_QUICKSTART_LIBPNG)
-ENABLE_BROFFICE=""
-AC_MSG_CHECKING([whether to enable BrOffice branding])
-if test "$enable_broffice" = "yes"; then
- ENABLE_BROFFICE="TRUE"
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_BROFFICE)
-
dnl ===================================================================
dnl Check whether the Cairo libraries are available.
dnl ===================================================================
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 470d562..f4f1eda 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -139,14 +139,6 @@ sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
ure: $(foreach,i,$(alllangiso) ure_$i)
-broffice: $(foreach,i,$(alllangiso) broffice_$i)
-
-brofficedev: $(foreach,i,$(alllangiso) brofficedev_$i)
-
-brofficewithjre: $(foreach,i,$(alllangiso) brofficewithjre_$i)
-
-broolanguagepack : $(foreach,i,$(alllangiso) broolanguagepack_$i)
-
oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i)
oxygenofficewithjre: $(foreach,i,$(alllangiso) oxygenofficewithjre_$i)
@@ -202,14 +194,6 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
-$(foreach,i,$(alllangiso) broffice_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) brofficedev_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) brofficewithjre_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) broolanguagepack_$i) : $(ADDDEPS)
-
$(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $(ADDDEPS)
@@ -279,30 +263,6 @@ ure_%{$(PKGFORMAT:^".")} :
-msilanguage $(COMMONMISC)$/win_ulffiles
.ENDIF
-$(foreach,i,$(alllangiso) broffice_$i) : $$@{$(PKGFORMAT:^".")}
-.IF "$(MAKETARGETS)"!=""
-.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
-$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
-.ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-.ENDIF # "$(MAKETARGETS)"!=""
-broffice_%{$(PKGFORMAT:^".")} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
-$(foreach,i,$(alllangiso) brofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
-brofficewithjre_%{$(PKGFORMAT:^".")} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) brofficedev_$i) : $$@{$(PKGFORMAT:^".")}
-brofficedev_%{$(PKGFORMAT:^".")} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
-$(foreach,i,$(alllangiso) broolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-broolanguagepack_%{$(PKGFORMAT:^".")} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
$(foreach,i,$(alllangiso) oxygenoffice_$i) : $$@{$(PKGFORMAT:^".")}
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
@@ -334,7 +294,7 @@ openoffice:
.IF "$(DISABLE_PYTHON)" != "TRUE"
.IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
.ENDIF # "$(LOCALPYFILES)"!=""
$(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
@@ -348,14 +308,6 @@ $(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/brand_dev$/intro.zip
@-$(MKDIR) $(@:d)
$(COPY) $< $@
-$(BIN)$/broffice_dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_dev_nologo$/intro.zip
- @-$(MKDIR) $(@:d)
- $(COPY) $< $@
-
-$(BIN)$/broffice$/images_brand.zip : $(SOLARCOMMONBINDIR)$/broffice_nologo$/images_brand.zip
- @-$(MKDIR) $(@:d)
- $(COPY) $< $@
-
hack_msitemplates .PHONY:
-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 15288af..4e9e43d 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -53,7 +53,6 @@ LibreOffice
variables
{
PRODUCTNAME LibreOffice
- PRODUCTNAME_BR BrOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -92,8 +91,6 @@ LibreOffice
PATCHCODEFILE ooo_patchcodes.txt
DOWNLOADBANNER ooobanner.bmp
DOWNLOADBITMAP ooobitmap.bmp
- DOWNLOADBANNER_BR brobanner.bmp
- DOWNLOADBITMAP_BR brobitmap.bmp
DOWNLOADSETUPICO ooosetup.ico
RELATIVE_PATHES_IN_DDF 1
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
@@ -121,7 +118,6 @@ LibreOffice_wJRE
variables
{
PRODUCTNAME LibreOffice
- PRODUCTNAME_BR BrOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -301,7 +297,6 @@ LibreOffice_SDK
variables
{
PRODUCTNAME LibreOffice
- PRODUCTNAME_BR BrOffice
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -400,7 +395,6 @@ OxygenOffice
variables
{
PRODUCTNAME OxygenOffice
- PRODUCTNAME_BR OxygenOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -440,8 +434,6 @@ OxygenOffice
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 +461,6 @@ OxygenOffice_wJRE
variables
{
PRODUCTNAME OxygenOffice
- PRODUCTNAME_BR OxygenOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -510,8 +501,6 @@ OxygenOffice_wJRE
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/
diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp
index 2f6e606..c678e74 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -29,7 +29,6 @@
FolderItem gid_Folderitem_Sbase
Name = "%PRODUCTNAME Base";
- Name (pt-BR) = "%PRODUCTNAME_BR Base";
ModuleID = gid_Module_Prg_Base_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Sbase;
diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp
index c32ffa0..36cd965 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -29,7 +29,6 @@
FolderItem gid_Folderitem_Scalc
Name = "%PRODUCTNAME Calc";
- Name (pt-BR) = "%PRODUCTNAME_BR Calc";
ModuleID = gid_Module_Prg_Calc_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Scalc;
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
index 2a302e5..4a73948 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -29,7 +29,6 @@
FolderItem gid_Folderitem_Sdraw
Name = "%PRODUCTNAME Draw";
- Name (pt-BR) = "%PRODUCTNAME_BR Draw";
ModuleID = gid_Module_Prg_Draw_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Sdraw;
diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp
index e9a0708..db7b0c3 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -29,7 +29,6 @@
FolderItem gid_Folderitem_Simpress
Name = "%PRODUCTNAME Impress";
- Name (pt-BR) = "%PRODUCTNAME_BR Impress";
ModuleID = gid_Module_Prg_Impress_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Simpress;
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
index 49f1b8c..2decfb2 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -29,7 +29,6 @@
FolderItem gid_Folderitem_Smath
Name = "%PRODUCTNAME Math";
- Name (pt-BR) = "%PRODUCTNAME_BR Math";
ModuleID = gid_Module_Prg_Math_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Smath;
diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
index db3e5b1..b6ef81e 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -29,7 +29,6 @@
FolderItem gid_Folderitem_Soffice
Name = "%PRODUCTNAME";
- Name (pt-BR) = "%PRODUCTNAME_BR";
ModuleID = gid_Module_Root;
FolderID = gid_Folder_Staroffice51;
FileID = gid_Brand_File_Bin_Soffice;
@@ -43,7 +42,6 @@ End
FolderItem gid_Folderitem_Soffice_Desktop
Name = "%PRODUCTNAME %PRODUCTVERSION";
- Name (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION";
ModuleID = gid_Module_Root;
FolderID = PREDEFINED_DESKTOP;
FileID = gid_Brand_File_Bin_Soffice;
diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp
index b99fc2c..26bdc09 100644
--- a/scp2/source/ooo/installation_ooo.scp
+++ b/scp2/source/ooo/installation_ooo.scp
@@ -29,7 +29,6 @@
Installation gid_Installation_Ooo
ProductName = "${PRODUCTNAME}";
- ProductName_Br = "${PRODUCTNAME_BR}";
ProductVersion = "${PRODUCTVERSION}";
ProductExtension = "${PRODUCTEXTENSION}";
OOoBaseVersion = "${OOOBASEVERSION}";
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 24a2cba..6aa7c4e 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -627,7 +627,6 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
ModuleID = gid_Module_Root;
Name = "ApplicationName";
Value = "%PRODUCTNAME %PRODUCTVERSION";
- Value (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION";
Styles = ();
End
diff --git a/scp2/source/quickstart/folderitem_quickstart.scp b/scp2/source/quickstart/folderitem_quickstart.scp
index 9de0a7c..b533637 100644
--- a/scp2/source/quickstart/folderitem_quickstart.scp
+++ b/scp2/source/quickstart/folderitem_quickstart.scp
@@ -30,7 +30,6 @@
FolderItem gid_Folderitem_Exe_Quickstart
ModuleID = gid_Module_Optional_Quickstart;
Name = "%PRODUCTNAME %PRODUCTVERSION";
- Name (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION";
FolderID = PREDEFINED_AUTOSTART;
FileID = gid_File_Exe_Install_Quickstart;
End
diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp
index cf9d5ad..7541e1d 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -29,7 +29,6 @@
FolderItem gid_Folderitem_Swriter
Name = "%PRODUCTNAME Writer";
- Name (pt-BR) = "%PRODUCTNAME_BR Writer";
ModuleID = gid_Module_Prg_Wrt_Bin;
FolderID = gid_Folder_Staroffice51;
FileID = gid_File_Exe_Swriter;
diff --git a/set_soenv.in b/set_soenv.in
index 489b0d3..833c237 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1531,7 +1531,6 @@ ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" );
ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" );
-ToFile( "ENABLE_BROFFICE", "@ENABLE_BROFFICE@", "e" );
ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" );
ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
ToFile( "ENABLE_PRESENTER_EXTRA_UI","@ENABLE_PRESENTER_EXTRA_UI@","e" );
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 05bc77a..9043a49 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -470,13 +470,6 @@ sub get_downloadname_productname
if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; }
- 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;
}
@@ -1970,8 +1963,6 @@ sub create_download_sets
# add product name into script template
put_windows_productname_into_template($templatefile, $allvariableshashref);
@path_substs = (
- 'DOWNLOADBANNER_BR' => 'BANNERBMPPLACEHOLDER_BR',
- 'DOWNLOADBITMAP_BR' => 'WELCOMEBMPPLACEHOLDER_BR',
'DOWNLOADBANNER' => 'BANNERBMPPLACEHOLDER',
'DOWNLOADBITMAP' => 'WELCOMEBMPPLACEHOLDER',
'DOWNLOADSETUPICO' => 'SETUPICOPLACEHOLDER'
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index 3a4adab..1b862a6 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -421,9 +421,6 @@ sub add_root_directories
my $productname;
$productname = $allvariableshashref->{'PRODUCTNAME'};
- if ($onelanguage eq 'pt-BR' && defined $allvariableshashref->{'PRODUCTNAME_BR'}) {
- $productname = $allvariableshashref->{'PRODUCTNAME_BR'};
- }
my $productversion = $allvariableshashref->{'PRODUCTVERSION'};
my $baseproductversion = $productversion;
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 4916146..9073bbd 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -149,11 +149,6 @@ sub get_productname($$)
my $name = $allvariables->{'PRODUCTNAME'};
- # BrOffice has its own locale-specific name
- if ($language eq 'pt-BR' && defined $allvariables->{'PRODUCTNAME_BR'}) {
- $name = $allvariables->{'PRODUCTNAME_BR'};
- }
-
return $name;
}
diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk
index 002c63a..972963b 100644
--- a/solenv/inc/productversion.mk
+++ b/solenv/inc/productversion.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-PRODUCTLIST = libreoffice broffice
+PRODUCTLIST = libreoffice
# default values to minimize maintainance effort
PRODUCTVERSION = 3.4
commit e2a7d485b4240f3462b88b4795d2a6d6bddab34d
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Apr 22 15:20:18 2011 +0200
do not enable BrOffice branding by default (fdo#36262)
diff --git a/configure.in b/configure.in
index 64cf424..6466aa8 100755
--- a/configure.in
+++ b/configure.in
@@ -279,7 +279,7 @@ AC_ARG_ENABLE(broffice,
AS_HELP_STRING([--disable-broffice],
[When disabled, broffice specific branding artwork for use in the pt_BR
locale is removed, giving uniform branding.]),
-,enable_broffice=yes)
+,enable_broffice=no)
AC_ARG_ENABLE(cairo,
AS_HELP_STRING([--disable-cairo],
commit 8603e4a1198466a0b99737ec41b1090abf0a839d
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Apr 22 11:29:22 2011 +0200
Disable BrOffice branding for official builds (fdo#36262)
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 799540d..4a59607 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -37,7 +37,6 @@
--enable-ext-pdfimport
--enable-epm
--enable-cairo
---enable-broffice
--enable-binfilter
--disable-xrender-link
--disable-unix-qstart
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 0b69a48..207a715 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -10,4 +10,3 @@
--enable-ext-wiki-publisher
--enable-ext-report-builder
--with-extension-integration
---enable-broffice
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index 336892f..340805a 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -11,7 +11,6 @@
--disable-unix-qstart
--disable-xrender-link
--enable-binfilter
---enable-broffice
--enable-cairo
--enable-gnome-vfs
--enable-gstreamer
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index dd96ffd..050bb7c 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -5,6 +5,5 @@
--without-agfa-monotype-fonts
--with-nlpsolver
--with-java-target-version=1.5
---enable-broffice
--disable-xrender-link
--disable-activex-component
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
index c8a2647..1a9ce95 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -2,6 +2,5 @@
--without-agfa-monotype-fonts
--with-java-target-version=1.5
--enable-cl-x64
---enable-broffice
--disable-xrender-link
--disable-activex-component
More information about the Libreoffice-commits
mailing list