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

[Tor Lillqvist]

 patches/dev300/apply                     |    7 ++++---
 patches/dev300/fpicker-common-build.diff |   21 +++++++--------------
 2 files changed, 11 insertions(+), 17 deletions(-)

New commits:
commit 4b1d8bff331d6c65848f77512208057030d6f7de
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 27 11:36:41 2009 +0300

    Comment out two fpicker patches
    
    * patches/dev300/apply: Comment out fpicker-common-build.diff and
      fpicker-show-checkbox.diff. I think they are not needed any more,
      but am not sure.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d29eefc..1b97beb 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1267,11 +1267,12 @@ about-build-ver-readability.diff, i#68590, tml
 
 [ Fpickers ]
 # Modify the fpicker makefile
-fpicker-common-build.diff, jholesov
-
+# FIXME: 2009-08-27: Presumably this is not needed any more. I am not
+# 100% sure, though, let's just comment out for now. --tml
+# fpicker-common-build.diff, jholesov
 # Show "Use OpenOffice.org dialogs" check box only if the system fpicker is
 # available (better implementation) FIXME IZ number
-fpicker-show-checkbox.diff, jholesov
+# fpicker-show-checkbox.diff, jholesov
 
 # Out-of-process implementation of KDE fpicker
 # FIXME: No IZ number for this, because it is necessary to do it internal first
commit ecd3f922d10ce5992bbc2ed638d5d5b14f88df9f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 27 10:58:14 2009 +0300

    Adapt fpicker-common-build.diff to dev300-m56
    
    * patches/dev300/fpicker-common-build.diff: Adapt to dev300-m56.

diff --git a/patches/dev300/fpicker-common-build.diff b/patches/dev300/fpicker-common-build.diff
index c086636..486162e 100644
--- a/patches/dev300/fpicker-common-build.diff
+++ b/patches/dev300/fpicker-common-build.diff
@@ -1,15 +1,9 @@
-Index: fpicker/prj/build.lst
-===================================================================
-RCS file: /cvs/gsl/fpicker/prj/build.lst,v
-retrieving revision 1.6
-Index: fpicker/prj/build.lst
-===================================================================
---- fpicker/prj/build.lst.ark	2006-11-02 12:36:21.000000000 +0100
-+++ fpicker/prj/build.lst	2006-11-02 12:37:44.000000000 +0100
+--- fpicker/prj/build.lst
++++ fpicker/prj/build.lst
 @@ -3,8 +3,10 @@ fp	fpicker\inc							nmake	-	all	
- fp	fpicker\source\generic				nmake	-	all	fp_generic fp_inc NULL
  fp	fpicker\source\office				nmake	-	all	fp_office fp_inc NULL
  fp	fpicker\source\unx\gnome			nmake	-	u	fp_gnome_filepicker fp_inc NULL
+ fp	fpicker\source\unx\kde4			nmake	-	u	fp_kde4_filepicker fp_inc NULL
 +fp	fpicker\source\unx\kde_unx			nmake	-	u	fp_unx_common fp_inc NULL
 +fp	fpicker\source\unx\kde				nmake	-	u	fp_unx_kde_filepicker fp_inc NULL
  fp	fpicker\source\aqua					nmake	-	u	fp_macosx_filepicker NULL
@@ -18,11 +12,9 @@ Index: fpicker/prj/build.lst
  fp  fpicker\source\win32\misc			nmake	-	w	fp_win32_misc fp_win32_filepicker.w fp_win32_folderpicker.w fp_inc NULL
 -fp	fpicker\util				nmake	-	all	fp_util fp_win32_filepicker.w fp_win32_misc.w fp_win32_folderpicker.w NULL
 +fp	fpicker\util				nmake	-	all	fp_util fp_gnome_filepicker.u fp_unx_common.u fp_unx_kde_filepicker.u fp_win32_filepicker.w fp_win32_misc.w fp_win32_folderpicker.w NULL
-Index: fpicker/prj/d.lst
-===================================================================
---- fpicker/prj/d.lst.orig	2004-07-31 19:07:38.523658664 +0200
-+++ fpicker/prj/d.lst	2004-07-31 19:13:36.267273368 +0200
-@@ -1,10 +1,12 @@
+--- fpicker/prj/d.lst
++++ fpicker/prj/d.lst
+@@ -1,11 +1,13 @@
  
  ..\%__SRC%\bin\f*.res %_DEST%\bin%_EXT%\
  ..\%__SRC%\bin\f*.dll %_DEST%\bin%_EXT%\
@@ -33,5 +25,6 @@ Index: fpicker/prj/d.lst
  ..\source\win32\filepicker\*.xml %_DEST%\xml%_EXT%\*.xml
  ..\source\win32\folderpicker\*.xml %_DEST%\xml%_EXT%\*.xml
  ..\source\unx\gnome\fps-gnome-ucd.txt %_DEST%\bin%_EXT%\fps-gnome-ucd.txt
+ ..\source\unx\kde4\fps-kde4-ucd.txt %_DEST%\bin%_EXT%\fps-kde4-ucd.txt
  ..\source\aqua\fps-aqua-ucd.txt %_DEST%\bin%_EXT%\fps-aqua-ucd.txt
 +..\source\unx\kde_unx\fps-kde-ucd.txt %_DEST%\bin%_EXT%\fps-kde-ucd.txt