ooo-build r12751 - in trunk: . patches/dev300

[jannieuw svn gnome org]

Author: jannieuw
Date: Mon Jun  2 09:18:40 2008
New Revision: 12751
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12751&view=rev

Log:
2008-06-02  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/gengal-three-layer-install-svx.diff:
	* patches/dev300/gengal-three-layer-install-scp2.diff: New file.  Fixes
	running gengal in ooo-build install (Unix).

	* patches/dev300/apply: Add them.


Added:
   trunk/patches/dev300/gengal-three-layer-install-scp2.diff
   trunk/patches/dev300/gengal-three-layer-install-svx.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jun  2 09:18:40 2008
@@ -478,6 +478,11 @@
 
 # import tooltip for userforms
 import-controls-tooltip.diff, i#90124, noelpwer
+
+# fix gengal for three layer install
+gengal-three-layer-install-svx.diff, i#89713, jannieuw
+gengal-three-layer-install-scp2.diff, i#89713, jannieuw
+
 [ RadioButtons ]
 # Add a GroupName property to RadioButtons so that RadioButtons don't need to
 # share the same name to be part of the same group.
@@ -1890,7 +1895,7 @@
 
 
 [ LayoutDialogs]
-SectionOwner => janniew
+SectionOwner => jannieuw
 
 cws-layoutdialogs-offapi.diff
 cws-layoutdialogs-scp2.diff

Added: trunk/patches/dev300/gengal-three-layer-install-scp2.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/gengal-three-layer-install-scp2.diff	Mon Jun  2 09:18:40 2008
@@ -0,0 +1,18 @@
+diff --git a/source/ooo/file_ooo.scp b/source/ooo/file_ooo.scp
+index ea1036e..1716182 100644
+--- scp2/source/ooo/file_ooo.scp
++++ scp2/source/ooo/file_ooo.scp
+@@ -212,6 +212,13 @@ End
+ 
+ #endif
+ 
++File gid_File_Profile_Gengal
++    BIN_FILE_BODY;
++    Dir = gid_Dir_Program;
++    Styles = (PACKED);
++    Name = PROFILENAME(gengal);
++End
++
+ #if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
+ 
+ File gid_File_Bin_Pluginapp

Added: trunk/patches/dev300/gengal-three-layer-install-svx.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/gengal-three-layer-install-svx.diff	Mon Jun  2 09:18:40 2008
@@ -0,0 +1,49 @@
+diff --git a/source/gengal/gengal.sh b/source/gengal/gengal.sh
+index e7b3a81..9e614ee 100644
+--- svx/source/gengal/gengal.sh
++++ svx/source/gengal/gengal.sh
+@@ -98,5 +98,8 @@ unset XENVIRONMENT
+ PATH="$sd_prog":$PATH
+ export PATH
+ 
++OOO_INSTALL_PREFIX=${OOO_INSTALL_PREFIX-$sd_prog/../..}
++export OOO_INSTALL_PREFIX
++
+ # execute binary
+ exec "$sd_prog/$sd_binary" "$@"
+diff --git a/source/gengal/gengalrc.in b/source/gengal/gengalrc.in
+new file mode 100644
+index 0000000..00ae5eb
+--- /dev/null
++++ svx/source/gengal/gengalrc.in
+@@ -0,0 +1,12 @@
++OOO_INSTALL_PREFIX_URL=file://${OOO_INSTALL_PREFIX}
++OOO_BASIS_URL=${OOO_INSTALL_PREFIX_URL}/basis-link
++OOO_BASIS_BIN_URL=${OOO_BASIS_URL}/program
++OOO_URE_URL=${OOO_BASIS_URL}/ure-link
++#
++#CFG_INIFILE=${OOO_BASIS_BIN_URL}/configmgrrc
++#BaseInstallation=${OOO_BASIS_URL}
++BRAND_BASE_DIR=${OOO_INSTALL_PREFIX_URL}
++OOO_BASE_DIR=${OOO_BASIS_URL}
++#
++UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb
++UNO_SERVICES=${OOO_URE_URL}/share/misc/services.rdb ${OOO_BASIS_BIN_URL}/services.rdb
+diff --git a/source/gengal/makefile.mk b/source/gengal/makefile.mk
+index d84b3f4..cb17531 100644
+--- svx/source/gengal/makefile.mk
++++ svx/source/gengal/makefile.mk
+@@ -83,8 +83,12 @@ APP1STDLIBS=$(TOOLSLIB) 		\
+ .INCLUDE :	target.mk
+ 
+ ALLTAR : \
+-	$(SCRIPTFILES)
++	$(SCRIPTFILES)\
++	$(BIN)/gengalrc
+ 
+ $(SCRIPTFILES) : $$(@:f:+".sh")
+ 	@tr -d "\015" < $(@:f:+".sh") > $@
+ 
++$(BIN)/%: %.in
++	cp $< $@
++