ooo-build r14779 - in branches/opensuse-11-1: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Mon Dec  8 17:13:57 2008
New Revision: 14779
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14779&view=rev

Log:
2008-12-08  Petr Mladek  <pmladek suse cz>

	* patches/dev300/dbaccess-righ-join-description.diff:  
	* patches/dev300/apply: fixes description of the RIGH JOIN selection
	  (bnc#431031, i#97026)
	
	* patches/dev300/no-latex-filter-without-writer2latex.diff:
	* patches/dev300/apply: port from ooo-build-3-0 branch; fix i93520

	* patches/dev300/system-python-ure-bootstrap.diff.in:
	* patches/dev300/pyuno-rpath-ooodir.diff.in:
	* patches/dev300/apply, patches/dev300/Makefile.am:
	* configure.in: port from ooo-build-3-0 branch; set python paths
	  (bnc#440090, deb#501028, i#90701)




Added:
   branches/opensuse-11-1/patches/dev300/dbaccess-righ-join-description.diff
   branches/opensuse-11-1/patches/dev300/no-latex-filter-without-writer2latex.diff
   branches/opensuse-11-1/patches/dev300/pyuno-rpath-ooodir.diff.in
   branches/opensuse-11-1/patches/dev300/system-python-ure-bootstrap.diff.in
Modified:
   branches/opensuse-11-1/ChangeLog
   branches/opensuse-11-1/configure.in
   branches/opensuse-11-1/patches/dev300/Makefile.am
   branches/opensuse-11-1/patches/dev300/apply

Modified: branches/opensuse-11-1/configure.in
==============================================================================
--- branches/opensuse-11-1/configure.in	(original)
+++ branches/opensuse-11-1/configure.in	Mon Dec  8 17:13:57 2008
@@ -1384,6 +1384,8 @@
 Makefile
 bin/setup
 bin/Makefile
+patches/dev300/pyuno-rpath-ooodir.diff
+patches/dev300/system-python-ure-bootstrap.diff
 bin/piece/sys-setup
 bin/piece/Makefile
 desktop/Makefile

Modified: branches/opensuse-11-1/patches/dev300/Makefile.am
==============================================================================
--- branches/opensuse-11-1/patches/dev300/Makefile.am	(original)
+++ branches/opensuse-11-1/patches/dev300/Makefile.am	Mon Dec  8 17:13:57 2008
@@ -1,4 +1,4 @@
-EXTRA_DIST = apply ${wildcard *.diff}
+EXTRA_DIST = apply ${wildcard *.diff*}
 
 patch.apply:
 	cd ../.. ; make patch.apply

Modified: branches/opensuse-11-1/patches/dev300/apply
==============================================================================
--- branches/opensuse-11-1/patches/dev300/apply	(original)
+++ branches/opensuse-11-1/patches/dev300/apply	Mon Dec  8 17:13:57 2008
@@ -434,6 +434,9 @@
 # allow other types of signing certs, fix by Jacob Berkman <jberkman novell com>
 xmlsecurity-verify-usages.diff, i#76871, pmladek
 
+# fixes description of the RIGH JOIN selection
+dbaccess-righ-join-description.diff, bnc#431031, i#97026, pmladek
+
 [ LinuxOnly ]
 # fix that allows OOo to work with a standard (unpatched) libjpeg,
 jpegc.c.diff, i#80674, n#272574, flr
@@ -1255,11 +1258,19 @@
 link-as-needed-bf.diff, i#89511, pmladek
 
 [ SystemBuildBits ]
+# !!!! applied only when libs_extern_sys source tarball is unpacked !!!!
 SectionOwner => fridrich
 
 # Mozilla build-bits to not break on Solaris 11
 moz-solaris11-makefiles.diff, fridrich
 
+[ BuildBits ]
+
+pyuno-rpath-ooodir.diff
+system-python-ure-bootstrap.diff, deb#501028, i#90701
+
+no-latex-filter-without-writer2latex.diff, i#93520
+
 [ DejaVuFonts ]
 
 # Following the changed names of DejaVu fonts

Added: branches/opensuse-11-1/patches/dev300/dbaccess-righ-join-description.diff
==============================================================================
--- (empty file)
+++ branches/opensuse-11-1/patches/dev300/dbaccess-righ-join-description.diff	Mon Dec  8 17:13:57 2008
@@ -0,0 +1,19 @@
+--- dbaccess/source/ui/querydesign/querydlg.cxx.old	2008-06-25 14:56:00.000000000 +0200
++++ dbaccess/source/ui/querydesign/querydlg.cxx	2008-12-05 20:53:05.000000000 +0100
+@@ -276,8 +276,16 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, List
+ 	String sHelpText = String( ModuleRes( nResId ) );
+ 	if( nPos )
+ 	{
++	    if ( eJoinType == RIGHT_JOIN )
++	    {
++		sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%2" ) ), sFirstWinName );
++		sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%1" ) ), sSecondWinName );
++	    }
++	    else
++	    {
+ 		sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%1" ) ), sFirstWinName );
+ 		sHelpText.SearchAndReplace( String( RTL_CONSTASCII_STRINGPARAM( "%2" ) ), sSecondWinName );
++	    }
+ 	}
+     if ( bAddHint )
+     {

Added: branches/opensuse-11-1/patches/dev300/no-latex-filter-without-writer2latex.diff
==============================================================================
--- (empty file)
+++ branches/opensuse-11-1/patches/dev300/no-latex-filter-without-writer2latex.diff	Mon Dec  8 17:13:57 2008
@@ -0,0 +1,37 @@
+Index: source/config/fragments/fcfg_writer.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/fcfg_writer.mk,v
+retrieving revision 1.14.20.1
+diff -u -r1.14.20.1 fcfg_writer.mk
+--- filter/source/config/fragments/fcfg_writer.mk	15 Aug 2008 10:33:45 -0000	1.14.20.1
++++ filter/source/config/fragments/fcfg_writer.mk	3 Sep 2008 14:16:49 -0000
+@@ -29,9 +29,13 @@
+     writer_MS_Word_2003_XML \
+ 	writer_MS_Word_2007_XML \
+ 	writer_MS_Word_2007_XML_Template \
+-    MediaWiki_File \
++    MediaWiki_File
++
++.IF "$(WITH_WRITER2LATEX)" != "NO"
++T4_WRITER += \
+ 	LaTeX \
+ 	BibTeX
++.ENDIF
+ 
+ # -----------------------------------------------
+ # count = 39
+@@ -63,9 +67,13 @@
+     writer_web_MediaWiki_File \
+     MS_Word_2003_XML \
+ 	MS_Word_2007_XML \
+-	MS_Word_2007_XML_Template \
++	MS_Word_2007_XML_Template
++
++.IF "$(WITH_WRITER2LATEX)" != "NO"
++F4_WRITER += \
+ 	LaTeX_Writer \
+ 	BibTeX_Writer
++.ENDIF
+ 
+ # -----------------------------------------------
+ # count = 14

Added: branches/opensuse-11-1/patches/dev300/pyuno-rpath-ooodir.diff.in
==============================================================================
--- (empty file)
+++ branches/opensuse-11-1/patches/dev300/pyuno-rpath-ooodir.diff.in	Mon Dec  8 17:13:57 2008
@@ -0,0 +1,16 @@
+Index: makefile.mk
+===================================================================
+RCS file: /cvs/udk/pyuno/source/module/makefile.mk,v
+retrieving revision 1.15
+diff -u -u -r1.15 makefile.mk
+--- pyuno/source/module/makefile.mk	15 Oct 2007 13:03:49 -0000	1.15
++++ pyuno/source/module/makefile.mk	24 Nov 2007 13:22:23 -0000
+@@ -121,7 +121,7 @@
+ .IF "$(GUI)" == "UNX"
+ $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
+ .IF "$(OS)" == "LINUX"
+-	@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
++	@echo $(LINK) -Wl,-z,combreloc $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) -Wl,-rpath,@libdir@/@OOOINSTALLDIRNAME@/basis-link/program $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
+ .ELIF "$(OS)" == "SOLARIS"
+ 	@echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
+ .ELIF "$(OS)" == "FREEBSD"

Added: branches/opensuse-11-1/patches/dev300/system-python-ure-bootstrap.diff.in
==============================================================================
--- (empty file)
+++ branches/opensuse-11-1/patches/dev300/system-python-ure-bootstrap.diff.in	Mon Dec  8 17:13:57 2008
@@ -0,0 +1,13 @@
+--- pyuno/source/module/uno.py 2008-10-07 11:49:54 +0000
++++ pyuno/source/module/uno.py 2008-10-07 11:57:11 +0000
+@@ -28,6 +28,10 @@
+ # for a copy of the LGPLv3 License.
+ #
+ #*************************************************************************
++import os
+ import sys
+ 
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
++    os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@libdir@/@OOOINSTALLDIRNAME@/program/fundamentalrc"
++
+ import pyuno