[ooo-build-commit] .: patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Fri Sep 3 09:42:39 PDT 2010
patches/dev300/apply | 2 -
patches/dev300/piece-build.diff | 14 +++----
patches/dev300/piece-packimages.diff | 16 +++-----
patches/dev300/piece-scripting-hack.diff | 62 -------------------------------
4 files changed, 14 insertions(+), 80 deletions(-)
New commits:
commit d960215887360fa6d42a6423876203e3ab22cbec
Author: Petr Mladek <pmladek at walk.suse.cz>
Date: Fri Sep 3 18:40:33 2010 +0200
update piece-*.diff to apply with ooo-build-3.2.98.0 sources
* patches/dev300/piece-build.diff: update
* patches/dev300/piece-packimages.diff: update
* patches/dev300/piece-scripting-hack.diff: bin obsolete
* patches/dev300/apply: bin piece-scripting-hack.diff
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c257853..60b45a3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3173,8 +3173,6 @@ piece-svx.diff
piece-vcl.diff
# zipintro is not kind to us ...
piece-scripting.diff
-# FIXME!!!: temporary hack to avoid cyclic build dependency
-piece-scripting-hack.diff
piece-helpcontent2.diff
piece-sdext.diff
piece-swext.diff
diff --git a/patches/dev300/piece-build.diff b/patches/dev300/piece-build.diff
index bfb482b..f2bf236 100644
--- a/patches/dev300/piece-build.diff
+++ b/patches/dev300/piece-build.diff
@@ -23,16 +23,16 @@
if (scalar keys %active_modules) {
$active_modules{$initial_module}++;
$modules_types{$initial_module} = 'mod';
-@@ -1118,6 +1126,9 @@ sub get_stand_dir {
- } else {
- $StandDir = cwd();
+@@ -1149,6 +1149,9 @@ sub get_stand_dir {
+ if ($StandDir eq $initial_dir) {
+ print_error('Found no project to build');
};
+ if ($build_all_dirs) {
+ return "$StandDir/";
+ }
- my $previous_dir = '';
- do {
- foreach (@possible_build_lists) {# ('build.lst', 'build.xlist');
+ $initial_module = substr($initial_dir, length($StandDir) + 1);
+ if ($initial_module =~ /\\|\//) {
+ $initial_module = File::Basename::dirname($initial_module);
@@ -1472,6 +1483,8 @@ sub get_options {
and $build_all_cont = $1 and next;
$arg =~ /^-a:(\S+)$/ and $build_all_parents = 1
@@ -41,7 +41,7 @@
+ and $build_all_dirs = $1 and next;
if ($arg =~ /^--from$/ || $arg =~ /^-f$/) {
$build_all_parents = 1;
- get_incomp_projects();
+ get_modules_passed(\%incompatibles);
@@ -2226,24 +2239,31 @@ sub get_tmp_dir {
sub retrieve_build_list {
my $module = shift;
diff --git a/patches/dev300/piece-packimages.diff b/patches/dev300/piece-packimages.diff
index 459474e..f94f278 100644
--- a/patches/dev300/piece-packimages.diff
+++ b/patches/dev300/piece-packimages.diff
@@ -1,19 +1,17 @@
--- packimages/pack/makefile.mk
+++ packimages/pack/makefile.mk
-@@ -38,17 +38,18 @@
+@@ -38,16 +38,17 @@
RSCCUSTOMIMG*=$(PRJ)
.INCLUDE: target.mk
+IMGSRC=$(SOLARVER)
IMAGES := $(COMMONBIN)$/images.zip
SORTED_LIST=$(RES)$/img$/sorted.lst
- # Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
- CUSTOM_IMAGE_SETS=hicontrast industrial crystal oxygen tango classic
+ # Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
+ CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango classic
CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
--CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
--CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
-+CUSTOM_PREFERRED_FALLBACK_1*=-c $(IMGSRC)$/ooo_custom_images$/tango
-+CUSTOM_PREFERRED_FALLBACK_2*=-c $(IMGSRC)$/ooo_custom_images$/industrial
+-CUSTOM_PREFERRED_FALLBACK*=-c $(SOLARSRC)$/ooo_custom_images$/tango
++CUSTOM_PREFERRED_FALLBACK*=-c $(IMGSRC)$/ooo_custom_images$/tango
-CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
-OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
@@ -36,8 +34,8 @@
+ $(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
-- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
-+ $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(IMGSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
+- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
++ $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(IMGSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
# make sure to have one to keep packing happy
$(COMMONBIN)$/images_brand.zip:
diff --git a/patches/dev300/piece-scripting-hack.diff b/patches/dev300/piece-scripting-hack.diff
deleted file mode 100644
index 3413920..0000000
--- a/patches/dev300/piece-scripting-hack.diff
+++ /dev/null
@@ -1,62 +0,0 @@
---- scripting/source/vbaevents/eventhelper.cxx.old 2010-07-19 15:16:09.000000000 +0200
-+++ scripting/source/vbaevents/eventhelper.cxx 2010-07-19 16:11:49.000000000 +0200
-@@ -78,7 +78,7 @@
- #include <basic/sbmeth.hxx>
- #include <basic/sbmod.hxx>
- #include <basic/sbx.hxx>
--#include <filter/msfilter/msvbahelper.hxx>
-+//#include <filter/msfilter/msvbahelper.hxx>
-
-
-
-@@ -1097,7 +1097,7 @@ EventListener::firing_Impl(const ScriptE
-
- OSL_TRACE("*** trying to invoke %s ",
- rtl::OUStringToOString( sToResolve, RTL_TEXTENCODING_UTF8 ).getStr() );
-- ooo::vba::VBAMacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve );
-+/* ooo::vba::VBAMacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve );
- if ( aMacroResolvedInfo.IsResolved() )
- {
- //liuchen 2009-6-8
-@@ -1139,6 +1139,7 @@ EventListener::firing_Impl(const ScriptE
- }
- }
- }
-+*/
- }
- }
- }
---- scripting/source/vbaevents/makefile.mk.old 2010-07-19 15:16:20.000000000 +0200
-+++ scripting/source/vbaevents/makefile.mk 2010-07-19 16:12:53.000000000 +0200
-@@ -69,7 +69,6 @@ SHL1STDLIBS= \
- $(BASICLIB) \
- $(COMPHELPERLIB) \
- $(SFXLIB) \
-- $(MSFILTERLIB) \
- $(CPPULIB) \
- $(TOOLSLIB) \
- $(SALLIB)
---- scripting/source/dlgprov/dlgevtatt.cxx.old 2010-07-19 17:22:49.000000000 +0200
-+++ scripting/source/dlgprov/dlgevtatt.cxx 2010-07-19 17:24:06.000000000 +0200
-@@ -53,7 +53,7 @@
-
- #include <ooo/vba/XVBAToOOEventDescGen.hpp>
- #include <com/sun/star/lang/XUnoTunnel.hpp>
--#include <vbahelper/vbaaccesshelper.hxx>
-+//#include <vbahelper/vbaaccesshelper.hxx>
-
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::awt;
-@@ -186,9 +186,9 @@ namespace dlgprov
- uno::Reference< lang::XUnoTunnel > xObjShellTunnel( rxModel, uno::UNO_QUERY );
- if ( xObjShellTunnel.is() )
- {
-- pFoundShell = reinterpret_cast<SfxObjectShell*>( xObjShellTunnel->getSomething(SfxObjectShell::getUnoTunnelId()));
-- if ( pFoundShell )
-- mbUseFakeVBAEvents = ooo::vba::isAlienExcelDoc( *pFoundShell ) || ooo::vba::isAlienWordDoc( *pFoundShell ) ;
-+// pFoundShell = reinterpret_cast<SfxObjectShell*>( xObjShellTunnel->getSomething(SfxObjectShell::getUnoTunnelId()));
-+// if ( pFoundShell )
-+// mbUseFakeVBAEvents = ooo::vba::isAlienExcelDoc( *pFoundShell ) || ooo::vba::isAlienWordDoc( *pFoundShell ) ;
- }
- }
- if ( mbUseFakeVBAEvents )
More information about the ooo-build-commit
mailing list