[Libreoffice-commits] .: configure.in distro-configs/GoOoLinux.conf.in distro-configs/GoOoMacOSX.conf.in distro-configs/GoOoWin32.conf.in distro-configs/Raw.conf.in patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Feb 22 07:58:23 PST 2011
configure.in | 4
distro-configs/GoOoLinux.conf.in | 55 -----------
distro-configs/GoOoMacOSX.conf.in | 10 --
distro-configs/GoOoWin32.conf.in | 8 -
distro-configs/Raw.conf.in | 3
patches/dev300/apply | 19 ----
patches/dev300/go-oo-splash.diff | 17 ---
patches/dev300/go-oo-win32-installer-branding.diff | 99 ---------------------
patches/dev300/go-oo-win32-registry-branding.diff | 38 --------
patches/dev300/go-oo-win32-vrb-branding.diff | 40 --------
10 files changed, 293 deletions(-)
New commits:
commit 912f0d8597fa4e2ea77a67078dd8b489ed020a6f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Feb 22 16:57:46 2011 +0100
Get rid of old obsolete distro configurations that nobody will ever use
diff --git a/configure.in b/configure.in
index 907318e..4baf4bc 100755
--- a/configure.in
+++ b/configure.in
@@ -1825,7 +1825,6 @@ distro-configs/CommonLinux.conf
distro-configs/CommonWin32.conf
distro-configs/CommonMac.conf
distro-configs/CrossWin32.conf
-distro-configs/GoOoWin32.conf
distro-configs/DroplineGNOME.conf
distro-configs/DroplineGNOME64.conf
distro-configs/Debian.conf
@@ -1869,9 +1868,6 @@ distro-configs/Pardus2008.conf
distro-configs/PlainLinux.conf
distro-configs/Win32.conf
distro-configs/Solaris.conf
-distro-configs/GoOoLinux.conf
-distro-configs/GoOoMacOSX.conf
-distro-configs/Raw.conf
distro-configs/LibreOfficeWin32.conf
distro-configs/LibreOfficeLinux.conf
distro-configs/LibreOfficeLinuxDevel.conf
diff --git a/distro-configs/GoOoLinux.conf.in b/distro-configs/GoOoLinux.conf.in
deleted file mode 100644
index c0224db..0000000
--- a/distro-configs/GoOoLinux.conf.in
+++ /dev/null
@@ -1,55 +0,0 @@
---with-intro-bitmaps=\"$TOOLSDIR/src/openintro_go-oo.bmp\"
---with-about-bitmaps=\"$TOOLSDIR/src/openabout_go-oo.bmp\"
---with-vendor=\"Go-oo Project\"
---disable-dbus
---disable-kde4
---disable-access
---enable-cairo
---without-system-cairo
---enable-gstreamer
---enable-odk
---enable-binfilter
---enable-gnome-vfs
---enable-hids
---enable-lockdown
---enable-opengl
---enable-ogltrans
---with-ant-home=/usr/share/ant
---with-java-target-version=1.5
---with-jdk-home=$JAVA_HOME
---without-myspell-dicts
---enable-epm
---enable-kde
---without-system-mozilla
---without-system-freetype
---without-system-jpeg
---without-system-libxml
---without-system-libxslt
---without-system-python
---without-system-zlib
---without-system-jars
---without-system-stdlibs
---disable-crypt-link
---disable-pam-link
---disable-xrender-link
---disable-randr-link
---without-openldap
---without-system-xrender-headers
---without-system-mesa-headers
---without-unix-wrapper
---with-fonts
---enable-ext-presenter-minimizer
---enable-ext-presenter-console
---enable-ext-pdfimport
---without-system-poppler
---enable-ext-wiki-publisher
---enable-ext-report-builder
---with-extension-integration
---with-linker-hash-style=both
---with-ant-home=$BUILDDIR/$APACHE_ANT
---with-system-dicts
---with-external-dict-dir=/usr/share/hunspell
---with-external-hyph-dir=/usr/share/hyphen
---with-external-thes-dir=/usr/share/mythes
---with-dict=ALL
---without-system-openssl
diff --git a/distro-configs/GoOoMacOSX.conf.in b/distro-configs/GoOoMacOSX.conf.in
deleted file mode 100644
index 8bafb33..0000000
--- a/distro-configs/GoOoMacOSX.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---with-intro-bitmaps=\"$TOOLSDIR/src/openintro_go-oo.bmp\"
---with-about-bitmaps=\"$TOOLSDIR/src/openabout_go-oo.bmp\"
---with-vendor=\"Go-oo Project\"
---enable-hids
---enable-ext-presenter-minimizer
---enable-ext-presenter-console
---enable-ext-pdfimport
---enable-ext-wiki-publisher
---enable-ext-report-builder
---with-extension-integration
diff --git a/distro-configs/GoOoWin32.conf.in b/distro-configs/GoOoWin32.conf.in
deleted file mode 100644
index 2514df2..0000000
--- a/distro-configs/GoOoWin32.conf.in
+++ /dev/null
@@ -1,8 +0,0 @@
---with-intro-bitmaps=\"$TOOLSDIR/src/openintro_go-oo.bmp\"
---with-about-bitmaps=\"$TOOLSDIR/src/openabout_go-oo.bmp\"
---with-vendor=\"Go-oo Project\"
---with-java-target-version=1.5
---enable-hids
---disable-activex-component
---without-agfa-monotype-fonts
---disable-xrender-link
diff --git a/distro-configs/Raw.conf.in b/distro-configs/Raw.conf.in
deleted file mode 100644
index 72cd097..0000000
--- a/distro-configs/Raw.conf.in
+++ /dev/null
@@ -1,3 +0,0 @@
---with-vendor=\"Go-oo Project\"
---with-java-target-version=1.5
---with-ant-home=$BUILDDIR/$APACHE_ANT
diff --git a/patches/dev300/apply b/patches/dev300/apply
index f2cc604..ff9d94d 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -114,18 +114,13 @@ NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin3
# Novell
NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
-# go-oo.org Win32
-GoOoWin32: NovellLikeWin32, GoOoOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, GoOoSplash
# Mac OS X
MacOSX : MacOSXCommon, MacOSXOnly
-GoOoMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, GoOoSplash
# Pardus
Pardus2007: PardusOnly, LinuxCommon, NotDebian
Pardus2008: PardusOnly, LinuxCommon, NotDebian
# Solaris
Solaris: NovellBase, UnstableExtensions
-# Universal Upstream-like packages
-GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, GoOoSplash
# OxygenOffice Professional
OxygenOfficeLinuxCommon : Common, FontConfigTemporaryHacks, LinuxOnly, \
msaccess, OpenGLTransitions, CliMonoCommon, Mono, MonoComp, AddressBooks, QuickStarter, KDE4,\
@@ -141,8 +136,6 @@ PlainLinux: PlainBuildFixes
CrossWin32 : CrossWin32Patches
# OOo4Kids flavor
OOo4Kids: OOo4KidsPatches
-# Generic Patch-less builds
-Raw: RawCommon RawPatches
# LibreOffice
LibreOfficeWin32: LibreOfficeCommon LibreOfficePatches LibreOfficeWin32Patches
LibreOfficeWin64: LibreOfficeCommon LibreOfficePatches LibreOfficeWin32Patches
@@ -506,11 +499,6 @@ debian-opt.diff
# to download it from elsewhere
reportdesign-mention-package-l10n.diff, rengelha
-[ GoOoSplash ]
-# move progress bar for go-oo splash
-go-oo-splash.diff
-
-
[ MandrivaOnly ]
SectionOwner => gghibo
# gcc401-stlport45-include.diff
@@ -611,13 +599,6 @@ build-java-1.4-l10ntools.diff, i#12345, pmladek
connectivity-load-libhsqldb-with-jre-1.4.diff, n#431360, pmladek
-[ GoOoOnlyWin32 ]
-SectionOwner => tml
-
-go-oo-win32-installer-branding.diff
-go-oo-win32-vrb-branding.diff, n#191913, i#68817
-go-oo-win32-registry-branding.diff, n#191913
-
[ NovellOnlyWin32 ]
SectionOwner => tml
diff --git a/patches/dev300/go-oo-splash.diff b/patches/dev300/go-oo-splash.diff
deleted file mode 100644
index 2530323..0000000
--- a/patches/dev300/go-oo-splash.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- instsetoo_native/util/openoffice.lst.old 2010-03-03 17:50:21.000000000 +0100
-+++ instsetoo_native/util/openoffice.lst 2010-03-03 17:50:36.000000000 +0100
-@@ -25,10 +25,10 @@ Globals
- POOLPRODUCT 1
- REGISTRATION_HOST https://registration.documentfoundation.org/RegistrationWeb
- REGISTRATIONURL http://survey.documentfoundation.org/user/index.php
-- PROGRESSBARCOLOR 126,170,23
-- PROGRESSSIZE 320,7
-- PROGRESSPOSITION 185,206
-- PROGRESSFRAMECOLOR 207,208,211
-+ PROGRESSBARCOLOR 186,189,182
-+ PROGRESSSIZE 186,5
-+ PROGRESSPOSITION 126,183
-+ PROGRESSFRAMECOLOR 255,255,255
- NATIVEPROGRESS true
- REGISTRYLAYERNAME Layers
- SERVICEPACK 1
diff --git a/patches/dev300/go-oo-win32-installer-branding.diff b/patches/dev300/go-oo-win32-installer-branding.diff
deleted file mode 100644
index 8cf3f6a..0000000
--- a/patches/dev300/go-oo-win32-installer-branding.diff
+++ /dev/null
@@ -1,99 +0,0 @@
---- instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf.old 2010-10-07 23:40:27.000000000 +0200
-+++ instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 2010-10-15 22:58:29.227734400 +0200
-@@ -284,7 +284,7 @@ en-US = "< &Back"
- en-US = "Cancel"
-
- [OOO_CONTROL_124]
--en-US = "Build contributed in collaboration with the community by The Document Foundation. For credits, see: http://www.documentfoundation.org"
-+en-US = "Build contributed in collaboration with the community by Go-oo Project. For credits, see: http://www.documentfoundation.org"
-
- [OOO_CONTROL_125]
- en-US = "&Next >"
---- instsetoo_native/util/makefile.mk.old 2010-10-15 21:12:29.412769600 +0200
-+++ instsetoo_native/util/makefile.mk 2010-10-15 22:58:29.237748800 +0200
-@@ -319,10 +319,14 @@ hack_msitemplates .PHONY:
- $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_go-oo.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_go-oo.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
-
- .IF "$(OS)" == "WNT"
-
---- instsetoo_native/util/openoffice.lst.old 2010-10-15 21:13:31.922654400 +0200
-+++ instsetoo_native/util/openoffice.lst 2010-10-15 22:58:29.247763200 +0200
-@@ -90,9 +90,9 @@ LibreOffice
- USE_FILEVERSION 1
- LIBRARYVERSION 9.3.0
- PATCHCODEFILE ooo_patchcodes.txt
-- DOWNLOADBANNER ooobanner.bmp
-- DOWNLOADBITMAP ooobitmap.bmp
-- DOWNLOADSETUPICO ooosetup.ico
-+ DOWNLOADBANNER ooobanner_go-oo.bmp
-+ DOWNLOADBITMAP ooobitmap_go-oo.bmp
-+ DOWNLOADSETUPICO ooosetup_go-oo.ico
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
- STARTCENTER_INFO_URL http://www.documentfoundation.org/
-@@ -156,9 +156,9 @@ LibreOffice_wJRE
- LIBRARYVERSION 9.3.0
- PATCHCODEFILE ooo_patchcodes.txt
- JAVAPRODUCT 1
-- DOWNLOADBANNER ooobanner.bmp
-- DOWNLOADBITMAP ooobitmap.bmp
-- DOWNLOADSETUPICO ooosetup.ico
-+ DOWNLOADBANNER ooobanner_go-oo.bmp
-+ DOWNLOADBITMAP ooobitmap_go-oo.bmp
-+ DOWNLOADSETUPICO ooosetup_go-oo.ico
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
- STARTCENTER_INFO_URL http://www.documentfoundation.org/
-@@ -227,9 +227,9 @@ LibreOffice_Dev
- LIBRARYVERSION 9.3.0
- PATCHCODEFILE ooodev_patchcodes.txt
- CODEFILENAME codes_ooodev.txt
-- DOWNLOADBANNER ooobanner.bmp
-- DOWNLOADBITMAP ooobitmap.bmp
-- DOWNLOADSETUPICO ooosetup.ico
-+ DOWNLOADBANNER ooobanner_go-oo.bmp
-+ DOWNLOADBITMAP ooobitmap_go-oo.bmp
-+ DOWNLOADSETUPICO ooosetup_go-oo.ico
- LOCALUSERDIR $ORIGIN/..
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
-@@ -270,9 +270,9 @@ URE
- PCPFILENAME ure.pcp
- POOLPRODUCT 0
- GLOBALFILEGID gid_File_Dl_Cppu
-- DOWNLOADBANNER urebanner.bmp
-- DOWNLOADBITMAP urebitmap.bmp
-- DOWNLOADSETUPICO ooosetup.ico
-+ DOWNLOADBANNER ooobanner_go-oo.bmp
-+ DOWNLOADBITMAP ooobitmap_go-oo.bmp
-+ DOWNLOADSETUPICO ooosetup_go-oo.ico
- DONTUSESTARTMENUFOLDER 1
- SERVICESPROJEKT 1
- RELATIVE_PATHES_IN_DDF 1
-@@ -318,9 +318,9 @@ LibreOffice_SDK
- NOVERSIONINDIRNAME 0
- NOSPACEINDIRECTORYNAME 1
- CHANGETARGETDIR 1
-- DOWNLOADBANNER ooosdkbanner.bmp
-- DOWNLOADBITMAP ooosdkbitmap.bmp
-- DOWNLOADSETUPICO ooosetup.ico
-+ DOWNLOADBANNER ooobanner_go-oo.bmp
-+ DOWNLOADBITMAP ooobitmap_go-oo.bmp
-+ DOWNLOADSETUPICO ooosetup_go-oo.ico
- DONTUSESTARTMENUFOLDER 1
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
diff --git a/patches/dev300/go-oo-win32-registry-branding.diff b/patches/dev300/go-oo-win32-registry-branding.diff
deleted file mode 100644
index 1a13716..0000000
--- a/patches/dev300/go-oo-win32-registry-branding.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- scp2/source/ooo/registryitem_ooo.scp
-+++ scp2/source/ooo/registryitem_ooo.scp
-@@ -393,6 +393,22 @@
- Value = "<progpath>\program\soffice.exe";
- End
-
-+RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Vendor_PackageVersion
-+ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-+ Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION\Go-oo";
-+ ModuleID = gid_Module_Root;
-+ Name = "PackageVersion";
-+ Value = "<ooo_packageversion>";
-+End
-+
-+RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Vendor_BuildVersion
-+ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-+ Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION\Go-oo";
-+ ModuleID = gid_Module_Root;
-+ Name = "BuildVersion";
-+ Value = "<buildversion>";
-+End
-+
- RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Install
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
-dummy line to avoid confusing diff-mode
---- solenv/bin/modules/installer/windows/registry.pm
-+++ solenv/bin/modules/installer/windows/registry.pm
-@@ -205,6 +205,9 @@
- $value =~ s/\\\"/\"/g; # no more masquerading of '"'
- $value =~ s/\\\\\s*$/\\/g; # making "\\" at end of value to "\"
- $value =~ s/\<progpath\>/\[INSTALLLOCATION\]/;
-+ $value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;
-+ $value =~ s/\<ooo_packageversion\>/$ENV{'OOO_PACKAGEVERSION'}/;
-+ $value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/;
- $value =~ s/\[INSTALLLOCATION\]\\/\[INSTALLLOCATION\]/; # removing "\" after "[INSTALLLOCATION]"
-
- if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }
diff --git a/patches/dev300/go-oo-win32-vrb-branding.diff b/patches/dev300/go-oo-win32-vrb-branding.diff
deleted file mode 100644
index 65913b8..0000000
--- a/patches/dev300/go-oo-win32-vrb-branding.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- desktop/util/ooverinfo.rc
-+++ desktop/util/ooverinfo.rc
-@@ -112,7 +112,7 @@
- block "040704E4"
- {
- // German StringTable
-- value "CompanyName", "OpenOffice.org\0"
-+ value "CompanyName", "Go-oo\0"
- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
- value "FileVersion", PPS(VER_LEVEL) "\0"
- value "ProductVersion", PPS(VER_LEVEL) "\0"
-@@ -124,7 +124,7 @@
- block "040904E4"
- {
- // International StringTable
-- value "CompanyName", "OpenOffice.org\0"
-+ value "CompanyName", "Go-oo\0"
- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
- value "FileVersion", PPS(VER_LEVEL) "\0"
- value "ProductVersion", PPS(VER_LEVEL) "\0"
---- solenv/inc/shlinfo.rc
-+++ solenv/inc/shlinfo.rc
-@@ -118,7 +118,7 @@
- block "040704E4"
- {
- // German StringTable
-- value "CompanyName", "OpenOffice.org\0"
-+ value "CompanyName", "Go-oo\0"
- value "FileVersion", PPS(VER_LEVEL) "\0"
- value "OriginalFilename", PPS(ORG_NAME) "\0"
- value "InternalName", PPS(INTERNAL_NAME) "\0"
-@@ -131,7 +131,7 @@
- block "040904E4"
- {
- // International StringTable
-- value "CompanyName", "OpenOffice.org\0"
-+ value "CompanyName", "Go-oo\0"
- value "FileVersion", PPS(VER_LEVEL) "\0"
- value "OriginalFilename", PPS(ORG_NAME) "\0"
- value "InternalName", PPS(INTERNAL_NAME) "\0"
More information about the Libreoffice-commits
mailing list