[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 4 commits - bin/unpack patches/dev300
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Mon Dec 20 03:52:38 PST 2010
bin/unpack | 7 ++--
patches/dev300/always_default_iconset.diff | 8 ++---
patches/dev300/ooop-splash.diff | 9 +++---
patches/dev300/ooop-win32-installer-branding.diff | 33 ++++++++++++++--------
4 files changed, 34 insertions(+), 23 deletions(-)
New commits:
commit 2d5cf3d660abb3b565a6a3245cd6e5a732bab47a
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Mon Dec 20 12:44:53 2010 +0100
Remove extensions' filename version during unpack
diff --git a/bin/unpack b/bin/unpack
index e84bf63..09fc4d8 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -881,9 +881,10 @@ fi
if test "x$CT2N_EXTENSION" != "x"; then
check_file $SRCDIR/$CT2N_EXTENSION
- echo "Linking ConvertTextToNumber extension sources to the expected name"
+ echo "Copying ConvertTextToNumber extension into the tree"
+ mkdir -p $OOBUILDDIR/extras/source/extensions/ || exit 1
md5=`md5sum $SRCDIR/$CT2N_EXTENSION | cut -d' ' -f1`
- ln -sf $SRCDIR/$CT2N_EXTENSION $SRCDIR/$md5-$CT2N_EXTENSION || exit 1
+ cp $SRCDIR/$md5-$CT2N_EXTENSION $OOBUILDDIR/extras/source/extensions/ConvertTextToNumber.oxt || exit 1
# create empty module dir so bin/applyflags could force applying the build patches
mkdir -p $OOBUILDDIR/ct2n
fi
@@ -931,7 +932,7 @@ if test "x$OOOBLOGGER_EXTENSION" != "x"; then
check_file $SRCDIR/$OOOBLOGGER_EXTENSION
echo "Copying oooblogger extension into the tree"
mkdir -p $OOBUILDDIR/extras/source/extensions/ || exit 1
- cp $SRCDIR/$OOOBLOGGER_EXTENSION $OOBUILDDIR/extras/source/extensions || exit 1
+ cp $SRCDIR/$OOOBLOGGER_EXTENSION $OOBUILDDIR/extras/source/extensions/oooblogger.oxt || exit 1
fi
if echo $PROPAGATED_ARGS | grep -q enable-mysql-connector; then
commit 1ef3bfd10db2e916b5481f27b7998649b44fc2ea
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Dec 4 18:51:04 2010 +0100
Set OxygenOffice default iconset
diff --git a/patches/dev300/always_default_iconset.diff b/patches/dev300/always_default_iconset.diff
index f9140a7..41b0cfd 100644
--- a/patches/dev300/always_default_iconset.diff
+++ b/patches/dev300/always_default_iconset.diff
@@ -1,15 +1,15 @@
--- vcl/source/app/settings.cxx.orig 2009-10-27 00:58:57.000000000 +0100
+++ vcl/source/app/settings.cxx 2009-10-27 00:59:38.000000000 +0100
-@@ -819,11 +819,11 @@
- if( bCont )
+@@ -822,11 +822,11 @@
{
- if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) )
+ if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ||
+ rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "windows" ) )
- nRet = STYLE_SYMBOLS_TANGO;
+ nRet = STYLE_SYMBOLS_DEFAULT;
else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
- nRet = STYLE_SYMBOLS_CRYSTAL;
+ nRet = STYLE_SYMBOLS_DEFAULT;
- else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
+ else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
- nRet = STYLE_SYMBOLS_OXYGEN;
+ nRet = STYLE_SYMBOLS_DEFAULT;
}
commit 4f7fab31d77cc368d15ee8702ac39e0dd3d34f9d
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Dec 4 18:44:26 2010 +0100
Make OxygenOffice splash patch apply again
diff --git a/patches/dev300/ooop-splash.diff b/patches/dev300/ooop-splash.diff
index ce19f4b..7a3f807 100644
--- a/patches/dev300/ooop-splash.diff
+++ b/patches/dev300/ooop-splash.diff
@@ -1,13 +1,14 @@
--- instsetoo_native/util/openoffice.lst.orig 2010-06-02 21:15:23.000000000 +0200
+++ instsetoo_native/util/openoffice.lst 2010-06-02 21:18:22.000000000 +0200
@@ -26,8 +26,8 @@
- REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
- REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
- PROGRESSBARCOLOR 14,133,205
+ REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
+ REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
+ PROGRESSBARCOLOR 14,133,205
- PROGRESSSIZE 320,7
-- PROGRESSPOSITION 185,206
+- PROGRESSPOSITION 165,186
+ PROGRESSSIZE 430,5
+ PROGRESSPOSITION 5,230
PROGRESSFRAMECOLOR 207,208,211
NATIVEPROGRESS true
REGISTRYLAYERNAME Layers
+
commit 7efd96547fe553d1a92185a6ac454d505364cd6a
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Dec 4 18:43:20 2010 +0100
Update for OxygenOffice
diff --git a/patches/dev300/ooop-win32-installer-branding.diff b/patches/dev300/ooop-win32-installer-branding.diff
index 3e3d402..3333b11 100644
--- a/patches/dev300/ooop-win32-installer-branding.diff
+++ b/patches/dev300/ooop-win32-installer-branding.diff
@@ -4,14 +4,14 @@
en-US = "Cancel"
[OOO_CONTROL_124]
--en-US = "Build contributed in collaboration with the community by Oracle. For credits, see: http://www.openoffice.org/welcome/credits.html"
-+en-US = "Build contributed in collaboration with the community by OxygenOffice Professional Team. For credits, see: http://www.openoffice.org/welcome/credits.html"
+-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 OxygenOffice Professional Team. For credits, see: http://www.documentfoundation.org"
[OOO_CONTROL_125]
en-US = "&Next >"
--- instsetoo_native/util/makefile.mk.old 2006-01-16 15:10:22.000000000 +0200
+++ instsetoo_native/util/makefile.mk 2006-01-17 12:58:26.000000000 +0200
-@@ -408,9 +408,17 @@
+@@ -319,10 +319,18 @@
$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
@@ -32,24 +32,28 @@
+ $(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
+ $(COPY) $(PRJ)$/res$/banner_ooop.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
+ .IF "$(OS)" == "WNT"
-
--- instsetoo_native/util/openoffice.lst.old 2006-01-17 12:23:31.000000000 +0200
+++ instsetoo_native/util/openoffice.lst 2006-01-17 14:24:08.000000000 +0200
-@@ -29,9 +29,9 @@
+@@ -91,11 +91,11 @@
USE_FILEVERSION 1
LIBRARYVERSION 9.3.0
PATCHCODEFILE ooo_patchcodes.txt
- DOWNLOADBANNER ooobanner.bmp
- DOWNLOADBITMAP ooobitmap.bmp
+- DOWNLOADBANNER_BR brobanner.bmp
+- DOWNLOADBITMAP_BR brobitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
+ 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.go-oo.org/getmore?cid=920794
- STARTCENTER_INFO_URL http://www.go-oo.org
-@@ -76,9 +76,9 @@
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+@@ -160,9 +160,11 @@
LIBRARYVERSION 9.3.0
PATCHCODEFILE ooo_patchcodes.txt
JAVAPRODUCT 1
@@ -58,11 +62,13 @@
- DOWNLOADSETUPICO ooosetup.ico
+ 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.go-oo.org/getmore?cid=920794
- STARTCENTER_INFO_URL http://www.go-oo.org
-@@ -122,9 +122,9 @@
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+ STARTCENTER_INFO_URL http://www.libreoffice.org/
+@@ -231,9 +233,11 @@
LIBRARYVERSION 9.3.0
PATCHCODEFILE ooodev_patchcodes.txt
CODEFILENAME codes_ooodev.txt
@@ -71,10 +77,13 @@
- DOWNLOADSETUPICO ooosetup.ico
+ DOWNLOADBANNER ooobanner_ooop.bmp
+ DOWNLOADBITMAP ooobitmap_ooop.bmp
++ DOWNLOADBANNER_BR ooobanner_ooop.bmp
++ DOWNLOADBITMAP_BR ooobitmap_ooop.bmp
+ DOWNLOADSETUPICO ooosetup.ico
LOCALUSERDIR $ORIGIN/..
RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+ STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
+
@@ -150,9 +150,9 @@
PCPFILENAME ure.pcp
POOLPRODUCT 0
More information about the Libreoffice-commits
mailing list