[ooo-build-commit] 2 commits - patches/dev300

[René Engelhard]

 patches/dev300/apply                    |    7 +++++++
 patches/dev300/ia64-nss-m1.diff         |   31 +++++++++++++++++++++++++++++++
 patches/dev300/ia64-nss.diff            |   31 +++++++++++++++++++++++++++++++
 patches/dev300/kde4_fpicker_fixes2.diff |   11 +++++++++++
 4 files changed, 80 insertions(+)

New commits:
commit 550a8f41380cbfd90eb7e37a35272ef180ff4367
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 20 17:56:39 2009 +0200

    add fpicker filter fix from launchpad.net/bugs/452518

diff --git a/patches/dev300/kde4_fpicker_fixes2.diff b/patches/dev300/kde4_fpicker_fixes2.diff
index f398f87..7508f41 100644
--- a/patches/dev300/kde4_fpicker_fixes2.diff
+++ b/patches/dev300/kde4_fpicker_fixes2.diff
@@ -236,3 +236,14 @@ index f7bf04f..c532db8 100644
  	
  	Display* pDisp = QX11Info::display();
  	SalKDEDisplay *pSalDisplay = new SalKDEDisplay(pDisp);
+--- fpicker/source/unx/kde4/KDE4FilePicker.cxx	2009-10-19 22:40:31.000000000 +0200
++++ fpicker/source/unx/kde4/KDE4FilePicker_new.cxx	2009-10-19 22:38:57.000000000 +0200
+@@ -349,7 +349,7 @@
+ rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
+     throw( uno::RuntimeException )
+ {
+-	QString filter = _filters[_dialog->currentFilter()];
++	QString filter = _dialog->filterWidget()->currentText();
+ 	
+ 	//default if not found
+ 	if (filter.isNull())
commit 15e2b1b26e819b585fa4bca775f89878e5fe5191
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 20 15:45:51 2009 +0200

    fix nss build on ia64 (from cws cmcfixes64)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9b527f8..3873355 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1114,6 +1114,13 @@ build-prebuilt-stax.diff, i#93116, pmladek
 # accessibility depends on juh.jar
 build-accessibility-dep.diff, i#105833, pmladek
 
+[ BuildBits < ooo320-m2 < dev300-m62 ]
+# fix ia64 nss build
+ia64-nss-m1.diff, i#105899
+[ BuildBits >= ooo320-m2 >= dev300-m62 ]
+# fix ia64 nss build
+ia64-nss.diff, i#105899
+
 [ BuildBits ]
 # use the link flags from the pkgconfig when using the system cairo
 cancas-cairo-linkflags.diff, i#105834, pmladek
diff --git a/patches/dev300/ia64-nss-m1.diff b/patches/dev300/ia64-nss-m1.diff
new file mode 100644
index 0000000..722c243
--- /dev/null
+++ b/patches/dev300/ia64-nss-m1.diff
@@ -0,0 +1,31 @@
+Index: solenv/inc/unxfbsdx.mk
+===================================================================
+--- solenv/inc/unxfbsdx.mk	(revision 276718)
++++ solenv/inc/unxfbsdx.mk	(working copy)
+@@ -50,3 +50,4 @@
+ 
+ # platform specific identifier for shared libs
+ DLLPOSTFIX=fx
++BUILD64=1
+Index: solenv/inc/unxlnga.mk
+===================================================================
+--- solenv/inc/unxlnga.mk	(revision 276792)
++++ solenv/inc/unxlnga.mk	(working copy)
+@@ -34,3 +34,4 @@
+ .INCLUDE : unxlng.mk
+ CFLAGS+=-DIA64
+ DLLPOSTFIX=la
++BUILD64=1
+Index: nss/makefile.mk
+===================================================================
+--- nss/makefile.mk	(revision 276718)
++++ nss/makefile.mk	(working copy)
+@@ -61,7 +61,7 @@
+ #LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
+ .EXPORT: LDFLAGS
+ 
+-.IF "$(CPU)"=="X"
++.IF "$(BUILD64)"=="1"
+ # force 64-bit buildmode
+ USE_64:=1
+ .EXPORT : USE_64
diff --git a/patches/dev300/ia64-nss.diff b/patches/dev300/ia64-nss.diff
new file mode 100644
index 0000000..1f68515
--- /dev/null
+++ b/patches/dev300/ia64-nss.diff
@@ -0,0 +1,31 @@
+Index: solenv/inc/unxfbsdx.mk
+===================================================================
+--- solenv/inc/unxfbsdx.mk	(revision 276718)
++++ solenv/inc/unxfbsdx.mk	(working copy)
+@@ -50,3 +50,4 @@
+ 
+ # platform specific identifier for shared libs
+ DLLPOSTFIX=fx
++BUILD64=1
+Index: solenv/inc/unxlnga.mk
+===================================================================
+--- solenv/inc/unxlnga.mk	(revision 276792)
++++ solenv/inc/unxlnga.mk	(working copy)
+@@ -34,3 +34,4 @@
+ .INCLUDE : unxlng.mk
+ CFLAGS+=-DIA64
+ DLLPOSTFIX=la
++BUILD64=1
+Index: nss/makefile.mk
+===================================================================
+--- nss/makefile.mk	(revision 276718)
++++ nss/makefile.mk	(working copy)
+@@ -58,7 +58,7 @@
+ 
+ .IF "$(GUI)"=="UNX"
+ .IF "$(OS)$(COM)"=="LINUXGCC"
+-.IF "$(CPU)"=="X"
++.IF "$(BUILD64)"=="1"
+ # force 64-bit buildmode
+ USE_64:=1
+ .EXPORT : USE_64