rdieter pushed to calligra (master). "drop patch, use sed"

[notifications at fedoraproject.org]

From 33107add47a40a1bf5d336a55e2e5d43b6d8d3fd Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 7 May 2015 14:35:53 -0500
Subject: drop patch, use sed


diff --git a/calligra-2.9.4-no_krita_gemini.patch b/calligra-2.9.4-no_krita_gemini.patch
deleted file mode 100644
index 2acc8f6..0000000
--- a/calligra-2.9.4-no_krita_gemini.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -up calligra-2.9.4/krita/CMakeLists.txt.no_krita_gemini calligra-2.9.4/krita/CMakeLists.txt
---- calligra-2.9.4/krita/CMakeLists.txt.no_krita_gemini	2015-05-07 13:26:12.404923005 -0500
-+++ calligra-2.9.4/krita/CMakeLists.txt	2015-05-07 14:11:42.458283058 -0500
-@@ -174,5 +174,5 @@ install(FILES  krita.appdata.xml DESTINA
- 
- if (${QTVERSION} VERSION_GREATER 4.7.0 AND NOT APPLE AND HAVE_OPENGL)
-     #add_subdirectory(sketch)
--    add_subdirectory(gemini)
-+    #add_subdirectory(gemini)
- endif ()
diff --git a/calligra.spec b/calligra.spec
index 34d1557..0ecf1c0 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -52,8 +52,6 @@ Patch2: calligra-2.9.0-disable_products.patch
 ## upstream patches
 
 ## upstreamable patches
-# upstream enabled this to build but not install... and build fails anyway.  win!  -- rex
-Patch50: calligra-2.9.4-no_krita_gemini.patch
 
 BuildRequires: boost-devel
 BuildRequires: bzip2-devel bzip2
@@ -513,7 +511,6 @@ Requires: %{name}-core = %{version}-%{release}
 %setup -q
 
 %patch2 -p1 -b .disable_products
-%patch50 -p1 -b .no_krita_gemini
 
 ## kdchart munging begin
 pushd 3rdparty/kdchart
@@ -525,8 +522,11 @@ sed -i -e 's|../src|../kdchart|' include/*
 popd
 ## kdchart munging end
 
-## disable kritasketch too, not ready
-sed -i -e 's|add_subdirectory(sketch)|#add_subdirectory(sketch)|g' krita/CMakeLists.txt
+## disable krita gemini/sketch too, not ready
+sed -i \
+  -e 's|add_subdirectory(sketch)|#add_subdirectory(sketch)|g' \
+  -e 's|add_subdirectory(gemini)|#add_subdirectory(gemini)|g' \
+  krita/CMakeLists.txt
 
 
 %build
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?h=master&id=33107add47a40a1bf5d336a55e2e5d43b6d8d3fd