diff --git a/calligra-2.9.4-no_krita_gemini.patch b/calligra-2.9.4-no_krita_gemini.patch new file mode 100644 index 0000000..2acc8f6 --- /dev/null +++ b/calligra-2.9.4-no_krita_gemini.patch @@ -0,0 +1,10 @@ +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 501a1a5..34d1557 100644 --- a/calligra.spec +++ b/calligra.spec @@ -52,6 +52,8 @@ 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 @@ -511,6 +513,7 @@ Requires: %{name}-core = %{version}-%{release} %setup -q %patch2 -p1 -b .disable_products +%patch50 -p1 -b .no_krita_gemini ## kdchart munging begin pushd 3rdparty/kdchart