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

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Thu Aug 14 13:40:48 2008
New Revision: 13568
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13568&view=rev

Log:
2008-08-14  Jan Holesovsky  <kendy suse cz>

        * patches/dev300/fpicker-kde-3layer.diff,
          patches/dev300/apply: Fix the kde fpicker to work with 3-layer OOo,
          n#413475.


Added:
   trunk/patches/dev300/fpicker-kde-3layer.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Aug 14 13:40:48 2008
@@ -1266,6 +1266,10 @@
 # Let the KDE and Gtk+ fpickers build and install FIXME IZ number
 fpicker-common-scp2.diff, jholesov
 
+# Fix the KDE fpicker for 3layer OOo
+fpicker-kde-3layer.diff, n#413475, jholesov
+
+
 [ AddressBooks ]
 
 # Evolution should also be default database(n#66217).

Added: trunk/patches/dev300/fpicker-kde-3layer.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/fpicker-kde-3layer.diff	Thu Aug 14 13:40:48 2008
@@ -0,0 +1,25 @@
+diff --git fpicker/source/unx/kde/makefile.mk fpicker/source/unx/kde/makefile.mk
+index 46e3f32..680e0f6 100644
+--- fpicker/source/unx/kde/makefile.mk
++++ fpicker/source/unx/kde/makefile.mk
+@@ -95,6 +95,7 @@ SLOFILES =\
+ 
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(SLOFILES)
++APP1RPATH=BRAND
+ APP1STDLIBS=\
+ 			$(SALLIB) \
+ 			$(KDE_LIBS) -lkio
+diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
+index b817b64..a3178ee 100644
+--- scp2/source/ooo/file_library_ooo.scp
++++ scp2/source/ooo/file_library_ooo.scp
+@@ -608,7 +608,7 @@ End
+ File gid_File_Bin_KdeFilePicker
+     BIN_FILE_BODY;
+     Styles = (PACKED);
+-    Dir = gid_Dir_Program;
++    Dir = gid_Brand_Dir_Program;
+     Name = "kdefilepicker";
+ End
+ #endif