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

[pmladek svn gnome org]

Author: pmladek
Date: Wed Jun 18 15:34:43 2008
New Revision: 12920
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12920&view=rev

Log:
2008-06-18  Petr Mladek  <pmladek suse cz>

	* patches/dev300/solenv-cwsid.diff, patches/dev300/apply: explicitely
	  convert cwsid to integer; otherwise, cws-extract does not work with
	  perl-5.10 on openSUSE-11.0 (i#90853)



Added:
   trunk/patches/dev300/solenv-cwsid.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jun 18 15:34:43 2008
@@ -491,6 +491,10 @@
 # for example, it fixes unopkg to do not show random localization
 tools-resmgr-set-defaultlocale.diff, n#399101, i#90820, pmladek
 
+# explicitely convert cwsid to integer
+# otherwise, cws-extract does not work with perl-5.10 on openSUSE-11.0
+solenv-cwsid.diff, i#90853, pmladek
+
 [ 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.

Added: trunk/patches/dev300/solenv-cwsid.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/solenv-cwsid.diff	Wed Jun 18 15:34:43 2008
@@ -0,0 +1,11 @@
+--- solenv/bin/modules/Cws.pm.old	2008-04-10 18:57:34.000000000 +0200
++++ solenv/bin/modules/Cws.pm	2008-06-10 13:19:53.000000000 +0200
+@@ -847,7 +847,7 @@ sub get_eis_id
+     my $child  = Eis::to_string($self->child());
+ 
+     my $result;
+-    eval { $result = $eis->getChildWorkspaceId($master, $child) };
++    eval { $result = int($eis->getChildWorkspaceId($master, $child)) };
+     if ( $@ ) {
+         carp("ERROR: get_eis_id(): EIS database transaction failed. Reason:\n$ \n");
+     }