[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 4 commits - bin/unpack distro-configs/SUSE-11.1.conf.in download.in patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Fri Mar 4 11:32:25 PST 2011
bin/unpack | 2 +-
distro-configs/SUSE-11.1.conf.in | 1 -
download.in | 2 +-
patches/dev300/piece-packimages.diff | 21 +++++++++++----------
patches/dev300/sled10-splash.diff | 17 +++++++++++++++++
5 files changed, 30 insertions(+), 13 deletions(-)
New commits:
commit 2436d0ece6cff6c5bacdadc93baf8f6af35c0f15
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Mar 4 20:31:38 2011 +0100
update setup_native_packinfo for the split build
does not affect normal build => need not be signed off
diff --git a/bin/unpack b/bin/unpack
index 9ed3ff1..d0474d6 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -289,7 +289,7 @@ if test "z$OOO_GIT" = "z" ; then
fi
# ugly hack around odd positioning of this info
echo "Unpacking setup_native .txt pieces"
- ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-3.3.1.1.tar.bz2 | $GNUTAR xf - ) || exit
+ ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-3.3.2.1.tar.bz2 | $GNUTAR xf - ) || exit
# hack to patch new files in the root dir
if test "z$PIECE" = "zbootstrap" ; then
touch $OOBUILDDIR/boost.m4
diff --git a/download.in b/download.in
index b8f3e13..03cced8 100755
--- a/download.in
+++ b/download.in
@@ -538,7 +538,7 @@ if ( $download_all || ( '@OOO_LANGS@' ne '' && '@OOO_LANGS@' ne 'en-US' ) || '@B
}
if ('@PIECE@' eq 'bootstrap') {
- source_file( 'setup_native_packinfo-3.3.1.1.tar.bz2' );
+ source_file( 'setup_native_packinfo-3.3.2.1.tar.bz2' );
}
if ('@OOOP_FONTS_PACK@' ne '') {
commit 7e808ad72a92015b1e8904a605d9d9711b534caf
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Mar 4 16:38:40 2011 +0100
enabled KDE4 support for SLED11
LO-3.3.1 fixed the remaining annoying bugs
diff --git a/distro-configs/SUSE-11.1.conf.in b/distro-configs/SUSE-11.1.conf.in
index af0c2c4..e940d14 100644
--- a/distro-configs/SUSE-11.1.conf.in
+++ b/distro-configs/SUSE-11.1.conf.in
@@ -1,6 +1,5 @@
--with-vendor=\"Novell, Inc.\"
--disable-access
---disable-kde4
--disable-odk
--disable-qadevooo
--enable-hids
commit 590e24d4593be6be94e810b2f4bdc293bb1c7717
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Mar 4 16:31:45 2011 +0100
regenerated piece-packimages.diff to apply with all patch versions
some patch versions do not like if the context is not 3 lines
diff --git a/patches/dev300/piece-packimages.diff b/patches/dev300/piece-packimages.diff
index 2026bd0..383a5ba 100644
--- a/patches/dev300/piece-packimages.diff
+++ b/patches/dev300/piece-packimages.diff
@@ -1,6 +1,6 @@
---- packimages/pack/makefile.mk
-+++ packimages/pack/makefile.mk
-@@ -38,18 +38,19 @@
+--- packimages/pack/makefile.mk.old 2010-11-11 16:35:27.000000000 +0100
++++ packimages/pack/makefile.mk 2011-02-18 19:17:04.000000000 +0100
+@@ -34,18 +34,19 @@ TARGET=packimages
RSCCUSTOMIMG*=$(PRJ)
.INCLUDE: target.mk
@@ -25,15 +25,16 @@
ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
-@@ -62,13 +63,13 @@
- @@-$(MKDIR) $(RES)$/img
+@@ -58,14 +59,14 @@ $(SORTED_LIST) : image-sort.lst
+ $(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST)
+ @@-$(MKDIR) $(RES)$/img
#+-$(RM) $@ $@.$(INPATH)
-- $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
+- $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
+ $(FIND) $(IMGSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(IMGSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
- $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@
+ $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@
$(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst
-- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
+- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
+ $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
images_% : $(RES)$/img$/commandimagelist.ilst
@@ -42,11 +43,11 @@
# make sure to have one to keep packing happy
$(COMMONBIN)$/images_brand.zip:
-@@ -80,7 +81,7 @@
+@@ -73,7 +74,7 @@ $(COMMONBIN)$/images_brand.zip:
# generate the HiContrast icon set
$(MISC)$/hicontrast.flag .PHONY :
-- $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@
+- $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@
+ $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(IMGSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@
# unpack the Crystal icon set
commit 2ea2f10ec082a0dd9e05e07c87e71c8d6a191b55
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Mar 4 16:29:00 2011 +0100
put back updated sled10-splash.diff
it is still needed for SLED10 build
diff --git a/patches/dev300/sled10-splash.diff b/patches/dev300/sled10-splash.diff
new file mode 100644
index 0000000..0bfd100
--- /dev/null
+++ b/patches/dev300/sled10-splash.diff
@@ -0,0 +1,17 @@
+--- instsetoo_native/util/openoffice.lst.old 2010-09-28 20:47:58.000000000 +0200
++++ instsetoo_native/util/openoffice.lst 2010-09-28 20:48:51.000000000 +0200
+@@ -25,10 +25,10 @@ Globals
+ POOLPRODUCT 1
+ REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb
+ REGISTRATIONURL http://survey.libreoffice.org/user/index.php
+- PROGRESSBARCOLOR 126,170,23
+- PROGRESSSIZE 319,10
+- PROGRESSPOSITION 164,225
+- PROGRESSFRAMECOLOR 207,208,211
++ PROGRESSBARCOLOR 227,227,227
++ PROGRESSSIZE 319,10
++ PROGRESSPOSITION 115,225
++ PROGRESSFRAMECOLOR 118,141,174
+ NATIVEPROGRESS true
+ REGISTRYLAYERNAME Layers
+ SERVICEPACK 1
More information about the Libreoffice-commits
mailing list