Re: [Libreoffice] Two services.rdb files in postprocess/packcomponents/makefile.mk ?!

I made the attached patches to get rid of the 'ooo-services.rdb' file
and fix the disabled-python build. Though, now I get a general
configuration error. stderr shows following message:

        Error: File 
/mnt/data/tmp/portage/app-office/libreoffice-3.3.99.1/work/libreoffice-bootstrap-3.3.99.1/desktop/source/app/langselect.cxx,
 Line 401:
        unsatisfied query for interface of type com.sun.star.lang.XMultiServiceFactory!

Well, this is still beta1. Let's see if beta2 or beta3 behave.
But already better than crashing for non-existant file.


Any thoughts or ideas?


Regards,
Hanno

--- postprocess/packcomponents/makefile.mk.orig 2011-04-21 14:38:24.538714491 +0200
+++ postprocess/packcomponents/makefile.mk      2011-04-21 14:41:07.030714284 +0200
@@ -124,6 +124,7 @@
     localebe1 \
     log \
     lwpfilter \
+    mailmerge \
     mcnttype \
     migrationoo2 \
     msfilter \
@@ -363,11 +364,9 @@
 my_components += avmedia.jar
 .END
 
-my_ooo_components = mailmerge
-
 .INCLUDE: target.mk
 
-ALLTAR : $(MISC)/services.rdb $(MISC)/ooo-services.rdb
+ALLTAR : $(MISC)/services.rdb
 
 $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
         $(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component")
@@ -378,14 +377,3 @@
     echo \
         '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
         > $@
-
-$(MISC)/ooo-services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
-        $(MISC)/ooo-services.input \
-        $(my_ooo_components:^"$(SOLARXMLDIR)/":+".component")
-    $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
-        $(SOLARENV)/bin/packcomponents.xslt $(MISC)/ooo-services.input
-
-$(MISC)/ooo-services.input : makefile.mk
-    echo '<list>' \
-        '$(my_ooo_components:^"<filename>":+".component</filename>")' \
-        '</list>' > $@
--- postprocess/prj/d.lst.orig  2011-04-21 14:45:21.062714209 +0200
+++ postprocess/prj/d.lst       2011-04-21 14:45:32.558714722 +0200
@@ -2,6 +2,5 @@
 ..\%__SRC%\bin\uiconfig.zip %_DEST%\bin%_EXT%\uiconfig.zip
 ..\%__SRC%\misc\*.xcd %_DEST%\xml%_EXT%\
 ..\%__SRC%\misc\lang\*.xcd %_DEST%\xml%_EXT%\
-..\%__SRC%\misc\ooo-services.rdb %_DEST%\xml%_EXT%\ooo\services.rdb
 ..\%__SRC%\misc\services.input %_DEST%\xml%_EXT%\services.input
 ..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\services.rdb
--- scp2/source/ooo/ooo_brand.scp.orig  2011-04-21 14:44:08.490714213 +0200
+++ scp2/source/ooo/ooo_brand.scp       2011-04-21 14:44:23.562715664 +0200
@@ -39,13 +39,6 @@
 End
 #endif
 
-File gid_Brand_File_ServicesRdb
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "/ooo/services.rdb";
-    Styles = (PACKED);
-End
-
 ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
     ProfileID = gid_Brand_Profile_Bootstrap_Ini;
     ModuleID = gid_Module_Root_Brand;
--- scp2/source/ooo/common_brand.scp.orig       2011-04-21 14:46:41.198714790 +0200
+++ scp2/source/ooo/common_brand.scp    2011-04-21 14:51:20.534714520 +0200
@@ -86,7 +86,6 @@
              gid_Brand_File_Msvcm80crt_Manifest,
              gid_Brand_File_Lib_Npsoplugin,
              gid_Brand_File_Lib_Subscrib_C05,
-             gid_Brand_File_ServicesRdb,
              gid_Brand_File_Share_Registry_Brand_Xcd,
              gid_Brand_File_Share_Registry_O5oo_Xcd,
              gid_Brand_File_Script_Unopkg,
@@ -1317,14 +1316,6 @@
     Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_TYPES}";
 End
 
-ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "URE_MORE_SERVICES";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_SERVICES} 
$ORIGIN/services.rdb";
-End
-
 ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;

--- postprocess/packcomponents/makefile.mk.orig 2011-04-22 12:02:00.278680458 +0200
+++ postprocess/packcomponents/makefile.mk      2011-04-22 12:05:06.086680205 +0200
@@ -124,7 +124,6 @@
     localebe1 \
     log \
     lwpfilter \
-    mailmerge \
     mcnttype \
     migrationoo2 \
     msfilter \
@@ -141,7 +140,6 @@
     placeware \
     preload \
     protocolhandler \
-    pythonloader \
     res \
     rpt \
     rptui \
@@ -194,6 +192,12 @@
     xsltfilter \
     xstor
 
+.IF "$(DISABLE_PYTHON)" != "TRUE"
+my_components += \
+    pythonloader \
+    mailmerge
+.ENDIF
+
 .IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX"
 my_components += splash
 .ENDIF