rpms/koffice/F-13 koffice-2.1.81-krita_disable_painterlyframework.patch, NONE, 1.1 koffice.spec, 1.140, 1.141

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12816

Modified Files:
	koffice.spec 
Added Files:
	koffice-2.1.81-krita_disable_painterlyframework.patch 
Log Message:
* Wed Mar 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 2:2.1.81-4
- omit krita painterlyframework plugin to workaround crasher (kde#224233)


koffice-2.1.81-krita_disable_painterlyframework.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE koffice-2.1.81-krita_disable_painterlyframework.patch ---
diff -up koffice-2.1.81/krita/plugins/extensions/CMakeLists.txt.krita_disable_painterlyframework koffice-2.1.81/krita/plugins/extensions/CMakeLists.txt
--- koffice-2.1.81/krita/plugins/extensions/CMakeLists.txt.krita_disable_painterlyframework	2010-03-13 09:17:16.000000000 -0600
+++ koffice-2.1.81/krita/plugins/extensions/CMakeLists.txt	2010-03-24 09:40:58.894359577 -0500
@@ -21,7 +21,7 @@ add_subdirectory( dockers )
 add_subdirectory( extensionsmanager )
 
 if(OPENEXR_FOUND)
-  add_subdirectory( painterlyframework )
+# add_subdirectory( painterlyframework )
 endif(OPENEXR_FOUND)
 
 find_package(OpenShiva)


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-13/koffice.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- koffice.spec	23 Mar 2010 23:48:12 -0000	1.140
+++ koffice.spec	24 Mar 2010 15:21:26 -0000	1.141
@@ -17,7 +17,7 @@
 Name:           koffice
 Epoch:          3 
 Version:        2.1.81
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -27,6 +27,9 @@ URL:            http://www.koffice.org/
 Source0:        http://download.kde.org/unstable/koffice-%{version}/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# workaround krita startup crasher, https://bugs.kde.org/224233
+Patch1: koffice-2.1.81-krita_disable_painterlyframework.patch
+
 ## upstreamable patches
 Patch50: koffice-2.1.81-dsolinking.patch
 
@@ -268,6 +271,8 @@ Group:          Applications/Productivit
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
 Requires:       %{name}-krita-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-filters
+# to make bundled scripts work
+#Requires:      kross(javascript) kross(python) kross(ruby)
 %description krita
 %{summary}
 
@@ -410,6 +415,7 @@ Requires:       libxml2-devel
 %prep
 %setup -q
 
+%patch1 -p1 -b .krita_disable_painterlyframework
 %patch50 -p1 -b .dsolinking
 
 
@@ -420,9 +426,9 @@ pushd %{_target_platform}
 # SET EIGEN2_INCLUDE_DIR since our kde4_incdir != eigen2_incdir
 %{cmake_kde4} \
   -DEIGEN2_INCLUDE_DIR=%{_includedir}/eigen2 \
-  %{?kchart:-DBUILD_kchart=BOOL:ON} \
-  %{?kexi:-DBUILD_kexi=BOOL:ON} \
-  %{?kplato:-DBUILD_kplato=BOOL:ON} \
+  %{?kchart:-DBUILD_kchart:BOOL=ON} \
+  %{?kexi:-DBUILD_kexi:BOOL=ON} \
+  %{?kplato:-DBUILD_kplato:BOOL=ON} \
   ..
 popd
 
@@ -1052,6 +1058,9 @@ update-desktop-database -q &> /dev/null 
 
 
 %changelog
+* Wed Mar 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 2:2.1.81-4
+- omit krita painterlyframework plugin to workaround crasher (kde#224233)
+
 * Tue Mar 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 2:2.1.81-3
 - explicitly enable kplato